电子报聘审批通知7

yd-api/src/main/java/com/yd/api/agms/service/impl/AgmsHiringServiceImpl.java

@@ -75,8 +75,6 @@ public class AgmsHiringServiceImpl implements AgmsHiringService {
     private MdDropOptionsDALService mdDropOptionsDALService;
     private MdDropOptionsDALService mdDropOptionsDALService;
     @Autowired
     @Autowired
     private WechatService wechatService;
     private WechatService wechatService;
-    @Autowired
-    private AclFileUploadDALService aclFileUploadDALService;
 
 
     @Autowired
     @Autowired
     public void setAgmsHiringDalService(AgmsHiringDALService agmsHiringDalService){
     public void setAgmsHiringDalService(AgmsHiringDALService agmsHiringDalService){
@@ -646,18 +644,6 @@ public class AgmsHiringServiceImpl implements AgmsHiringService {
         setting.setUpdatedAt(new Date());
         setting.setUpdatedAt(new Date());
         setting.setUpdatedBy(operater);
         setting.setUpdatedBy(operater);
         aclPractitionerSettingDalService.save(setting);
         aclPractitionerSettingDalService.save(setting);
-
-        // 更新经纪人微信二维码targetId为practitionerId
-        AclFileUpload aclFileUpload = new AclFileUpload();
-        aclFileUpload.setTargetType(1);
-        aclFileUpload.setTargetId(hiringBasicInfoId);
-        aclFileUpload.setTargetUseFor(9);
-        aclFileUpload.setIsActive(1);
-        List<AclFileUpload> aclFileUploadList = aclFileUploadDALService.findByAclFileUpload(aclFileUpload);
-        for (AclFileUpload file : aclFileUploadList) {
-            file.setTargetId(practitioner.getId());
-            aclFileUploadDALService.updateFileUpload(file);
-        }
     }
     }
 
 
     private PractitionerHiringApproveSteps getHiringApproveStatus(Long loginId, String practitionerLevelId, List<PractitionerHiringApproveRecords> practitionerHiringApproveRecordsList) {
     private PractitionerHiringApproveSteps getHiringApproveStatus(Long loginId, String practitionerLevelId, List<PractitionerHiringApproveRecords> practitionerHiringApproveRecordsList) {

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerHiringServiceImpl.java

@@ -782,6 +782,19 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
             updateObj.setContractOssPath(contractOssPath);
             updateObj.setContractOssPath(contractOssPath);
             aclPractitionerMapper.updateByPrimaryKeySelective(updateObj);
             aclPractitionerMapper.updateByPrimaryKeySelective(updateObj);
 
 
+            // 更新经纪人微信二维码targetId为practitionerId
+            AclFileUpload aclFileUpload = new AclFileUpload();
+            aclFileUpload.setTargetType(1);
+            aclFileUpload.setTargetId(hiringBasicInfoId);
+            aclFileUpload.setTargetUseFor(9);
+            aclFileUpload.setIsActive(1);
+            List<AclFileUpload> aclFileUploadList = aclFileUploadDALService.findByAclFileUpload(aclFileUpload);
+            for (AclFileUpload file : aclFileUploadList) {
+                file.setTargetId(practitioner.getId());
+                file.setTargetNo(practitionerCode);
+                aclFileUploadDALService.updateFileUpload(file);
+            }
+
             //合同生成后，发短信通知报聘人，辅导人，团队长
             //合同生成后，发短信通知报聘人，辅导人，团队长
             this.sendMsgAfterPDF(hiringBasicInfoId);
             this.sendMsgAfterPDF(hiringBasicInfoId);
 
 
@@ -959,7 +972,7 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
                 // 2.2 保存入库
                 // 2.2 保存入库
                 AclFileUpload aclFileUpload = new AclFileUpload();
                 AclFileUpload aclFileUpload = new AclFileUpload();
                 aclFileUpload.setTargetType(1);
                 aclFileUpload.setTargetType(1);
-                aclFileUpload.setTargetId(basicInfoId);
+                aclFileUpload.setTargetId(basicInfoId);// 报聘时上传的微信二维, targetId是basicInfoId, 审批通过后会更新为practitionerId
                 aclFileUpload.setTargetNo("");
                 aclFileUpload.setTargetNo("");
                 aclFileUpload.setFileType("jpg");
                 aclFileUpload.setFileType("jpg");
                 aclFileUpload.setFileName(originalFilename);
                 aclFileUpload.setFileName(originalFilename);
@@ -967,7 +980,6 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
                 aclFileUpload.setTargetUseFor(9);
                 aclFileUpload.setTargetUseFor(9);
                 aclFileUpload.setFileSize(String.valueOf(inputStream.available()));
                 aclFileUpload.setFileSize(String.valueOf(inputStream.available()));
                 aclFileUpload.setIsActive(1);
                 aclFileUpload.setIsActive(1);
-                aclFileUpload.setRemark("报聘时上传的微信二维, targetId是basicInfoId");
                 aclFileUpload.setUploadedAt(new Date());
                 aclFileUpload.setUploadedAt(new Date());
                 aclFileUpload.setUploadedBy(-1L);
                 aclFileUpload.setUploadedBy(-1L);
                 aclFileUpload.setTargetSeq(1);
                 aclFileUpload.setTargetSeq(1);