合同工作经历问题修复

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

@@ -336,9 +336,9 @@ public class PractitionerHiringContractServiceImpl implements PractitionerHiring
 
 
     private void setWorkingExperience(Map<String, String> data, List<AclPractitionerHiringWorkingExperience> workingExperienceList) {
     private void setWorkingExperience(Map<String, String> data, List<AclPractitionerHiringWorkingExperience> workingExperienceList) {
 
 
-        StringBuffer experienceKey = new StringBuffer("secondWorkingExperience");
-        StringBuffer positionKey = new StringBuffer("secondWorkingPosition");
-        StringBuffer periodKey = new StringBuffer("secondWorkingPeriod");
+        String experienceKey = "secondWorkingExperience";
+        String positionKey = "secondWorkingPosition";
+        String periodKey = "secondWorkingPeriod";
 
 
         String experienceValue = "";
         String experienceValue = "";
         String positionValue = "";
         String positionValue = "";
@@ -351,19 +351,15 @@ public class PractitionerHiringContractServiceImpl implements PractitionerHiring
                 item = workingExperienceList.get(i);
                 item = workingExperienceList.get(i);
             }
             }
 
 
-            experienceKey.append(i + 1);
-            positionKey.append(i + 1);
-            periodKey.append(i + 1);
-
             if (item != null) {
             if (item != null) {
                 experienceValue = item.getWorkingCompany();
                 experienceValue = item.getWorkingCompany();
                 positionValue = item.getPosition();
                 positionValue = item.getPosition();
                 periodValue = item.getWorkingStart() + "~" + item.getWorkingEnd();
                 periodValue = item.getWorkingStart() + "~" + item.getWorkingEnd();
             }
             }
 
 
-            data.put(experienceKey.toString(), experienceValue);
-            data.put(positionKey.toString(), positionValue);
-            data.put(periodKey.toString(), periodValue);
+            data.put(experienceKey + (i + 1), experienceValue);
+            data.put(positionKey + (i + 1), positionValue);
+            data.put(periodKey + (i + 1), periodValue);
         }
         }
     }
     }
 
 

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

@@ -12,6 +12,7 @@ import com.yd.dal.mapper.customer.*;
 import com.yd.dal.service.customer.AclPractitionerHiringApproveRecordsDALService;
 import com.yd.dal.service.customer.AclPractitionerHiringApproveRecordsDALService;
 import com.yd.dal.service.practitioner.PractitionerHiringDALService;
 import com.yd.dal.service.practitioner.PractitionerHiringDALService;
 import com.yd.rmi.ali.oss.service.OssService;
 import com.yd.rmi.ali.oss.service.OssService;
+import com.yd.rmi.ali.send.service.SendService;
 import com.yd.rmi.cache.SystemConfigService;
 import com.yd.rmi.cache.SystemConfigService;
 import com.yd.util.CommonUtil;
 import com.yd.util.CommonUtil;
 import com.yd.util.HttpUtil;
 import com.yd.util.HttpUtil;
@@ -52,6 +53,8 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
     private PractitionerHiringContractService hiringContractService;
     private PractitionerHiringContractService hiringContractService;
     @Autowired
     @Autowired
     private AclPractitionerMapper aclPractitionerMapper;
     private AclPractitionerMapper aclPractitionerMapper;
+    @Autowired
+    private SendService sendService;
 
 
     private PractitionerHiringDALService practitionerHiringDalService;
     private PractitionerHiringDALService practitionerHiringDalService;
     private SystemConfigService systemConfigService;
     private SystemConfigService systemConfigService;
@@ -711,6 +714,9 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
             updateObj.setContractOssPath(contractOssPath);
             updateObj.setContractOssPath(contractOssPath);
             aclPractitionerMapper.updateByPrimaryKeySelective(updateObj);
             aclPractitionerMapper.updateByPrimaryKeySelective(updateObj);
 
 
+            //合同生成后，发短信通知报聘人，辅导人，团队长
+//            this.sendMsgAfterPDF(hiringBasicInfoId);
+
             resp.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
             resp.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
             resp.setContractOssPath(contractOssPath);
             resp.setContractOssPath(contractOssPath);
 
 
@@ -721,6 +727,36 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
         return resp;
         return resp;
     }
     }
 
 
+    private void sendMsgAfterPDF(Long hiringBasicInfoId) {
+        AclPractitionerHiringBasicInfo basicInfo = basicInfoMapper.selectByPrimaryKey(hiringBasicInfoId);
+        AclPractitionerHiringMembership memberShip = membershipMapper.selectByHiringBasicInfoId(hiringBasicInfoId);
+
+        String[] mobileNoArr = new String[3];
+        mobileNoArr[0] = basicInfo.getMobileNo();
+
+        if (memberShip.getMentorPractitionerId() != null) {
+            AclPractitioner mentor = aclPractitionerMapper.selectByPrimaryKey(memberShip.getMentorPractitionerId());
+            mobileNoArr[1] = mentor.getMobileNo();
+        }
+
+        if (memberShip.getSubsystemOwnerId() != null) {
+            AclPractitioner system = aclPractitionerMapper.selectByPrimaryKey(memberShip.getSubsystemOwnerId());
+            mobileNoArr[2] = system.getMobileNo();
+        }
+
+//        orderNo = item.getOrderNo();
+//        times = CommonUtil.dateParseString(overdueDate,"HH:mm");
+//        customer = customerMap.get(item.getCustomerId());
+//        name = customer.getName();
+//        mobileNo = customer.getMobileNo();
+//        email = customer.getEmail();
+//        /* 短信提醒 */
+//        String content = "{\"name\":\""+name+"\",\"code\":\""+item.getOrderNo()+"\",\"time\":\""+times+"\",\"orderNo\":\""+orderNo+"\"}";
+//        sendService.sendEmailOrSMS("sms", mobileNo, "2", content, templateCode, null, null, "订单未支付提醒", 1, item.getId());
+
+
+    }
+
     @Override
     @Override
     public QueryPractitionerInfoResponseVO queryPractitionerInfo(QueryPractitionerInfoRequestVO requestVO) {
     public QueryPractitionerInfoResponseVO queryPractitionerInfo(QueryPractitionerInfoRequestVO requestVO) {
         QueryPractitionerInfoResponseVO resp = new QueryPractitionerInfoResponseVO();
         QueryPractitionerInfoResponseVO resp = new QueryPractitionerInfoResponseVO();