Merge branch 'master' of http://47.108.172.52:3000/dayou/item-management-1phase

dao/src/main/resources/mapper/MajorProductionMapper.xml

@@ -566,7 +566,6 @@
           and  wtr.handler_id =#{todoVO.handlerId}
           AND wnt.deleted = 0
           AND wtr.deleted = 0
-#           and pf.real_amount is not null
         <if test="keyword!=null and keyword!='' ">
             and (
             mp.name like concat('%',#{keyword},'%')
@@ -581,7 +580,7 @@
             and mp.production =#{todoVO.production}
         </if>
         ORDER BY
-            wtr.created DESC
+            mp.report_no ASC
     </select>
 
     <update id="updateSaveFileInfo" parameterType="java.util.List">

dao/src/main/resources/mapper/PersonalMapper.xml

@@ -239,6 +239,7 @@
             or p.bailorB_tel like concat('%',#{keyword},'%')
             )
         </if>
+        order by p.order_id DESC
     </select>
 
     <update id="updateSaveFileInfo" parameterType="java.util.List">

service/src/main/java/com/dayou/service/IPersonalService.java

@@ -37,7 +37,7 @@ public interface IPersonalService extends IService<Personal> {
 
     Boolean allotOutwardStaff(TaskRecordDTO<Personal> taskRecordDTO);
 
-    void updateCertificates(Long targetId, CertificateEnum cer);
+    void updateCertificates(Long targetId, CertificateEnum cer,String location);
 
     Boolean doRecall(Long id);
 

service/src/main/java/com/dayou/service/impl/PersonalServiceImpl.java

@@ -166,8 +166,12 @@ public class PersonalServiceImpl extends ServiceImpl<PersonalMapper, Personal> i
     }
 
     @Override
-    public void updateCertificates(Long targetId, CertificateEnum cer) {
+    public void updateCertificates(Long targetId, CertificateEnum cer,String location) {
         Personal personal = personalMapper.getByTargetId(targetId);
+        //更新订单上面的location
+        if (StrUtil.isNotBlank(location)){
+            personalService.update(new LambdaUpdateWrapper<Personal>().set(Personal::getLocation,location).eq(BaseEntity::getId,personal.getId()));
+        }
         if (personal!=null && StrUtil.isNotEmpty(personal.getCredentials())){
             List<String> credentials = JSON.parseArray(personal.getCredentials(), String.class);
             if (!credentials.contains(cer.name())){

service/src/main/java/com/dayou/service/impl/PersonalTargetServiceImpl.java

@@ -121,7 +121,8 @@ public class PersonalTargetServiceImpl extends ServiceImpl<PersonalTargetMapper,
     @Override
     public Boolean houseCertificate(PersonalHouseCertificateVO houseCertificateVO) {
         Long targetId = houseCertificateVO.getId();
-        personalService.updateCertificates(targetId,HOUSE_CERTIFICATE);
+        String location = houseCertificateVO.getLocation();
+        personalService.updateCertificates(targetId,HOUSE_CERTIFICATE,location);
         return this.update(new LambdaUpdateWrapper<PersonalTarget>().eq(BaseEntity::getId,targetId)
                 .set(PersonalTarget::getHouseCertificate,JSON.toJSONString(houseCertificateVO)));
     }
@@ -130,7 +131,7 @@ public class PersonalTargetServiceImpl extends ServiceImpl<PersonalTargetMapper,
     @Override
     public Boolean landCertificate(PersonalLandCertificateVO landCertificateVO) {
         Long targetId = landCertificateVO.getId();
-        personalService.updateCertificates(targetId,LAND_CERTIFICATE);
+        personalService.updateCertificates(targetId,LAND_CERTIFICATE,null);
         return this.update(new LambdaUpdateWrapper<PersonalTarget>().eq(BaseEntity::getId,targetId)
                 .set(PersonalTarget::getLandCertificate,JSON.toJSONString(landCertificateVO)));
     }
@@ -139,7 +140,9 @@ public class PersonalTargetServiceImpl extends ServiceImpl<PersonalTargetMapper,
     @Override
     public Boolean immovableCertificate(PersonalImmovableCertificateVO immovableCertificateVO) {
         Long targetId = immovableCertificateVO.getId();
-        personalService.updateCertificates(targetId,IMMOVABLE_CERTIFICATE);
+        //证件上面的坐落
+        String location = immovableCertificateVO.getLocation();
+        personalService.updateCertificates(targetId,IMMOVABLE_CERTIFICATE,location);
         return this.update(new LambdaUpdateWrapper<PersonalTarget>().eq(BaseEntity::getId,targetId)
                 .set(PersonalTarget::getImmovableCertificate,JSON.toJSONString(immovableCertificateVO)));
     }