工作经历，个人声明，合同条款保存接口调整

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

@@ -174,6 +174,7 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
         SaveWorkingExperienceResponseVO resp = new SaveWorkingExperienceResponseVO();
         SaveWorkingExperienceResponseVO resp = new SaveWorkingExperienceResponseVO();
         try {
         try {
             List<PractitionerHiringWorkingExperience> workingExperienceList = requestVO.getWorkingExperienceList();
             List<PractitionerHiringWorkingExperience> workingExperienceList = requestVO.getWorkingExperienceList();
+            Long basicInfoId = requestVO.getHiringBasicInfoId();
 
 
             List<AclPractitionerHiringWorkingExperience> dataObjList = new ArrayList<>();
             List<AclPractitionerHiringWorkingExperience> dataObjList = new ArrayList<>();
             Date curDate = new Date();
             Date curDate = new Date();
@@ -181,6 +182,8 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
             workingExperienceList.forEach(item -> {
             workingExperienceList.forEach(item -> {
                 AclPractitionerHiringWorkingExperience dataObj = new AclPractitionerHiringWorkingExperience();
                 AclPractitionerHiringWorkingExperience dataObj = new AclPractitionerHiringWorkingExperience();
                 BeanUtils.copyProperties(item, dataObj);
                 BeanUtils.copyProperties(item, dataObj);
+
+                dataObj.setHiringBasicInfoId(basicInfoId);
                 dataObj.setIsActive(1);
                 dataObj.setIsActive(1);
 
 
                 dataObj.setCreatedAt(curDate);
                 dataObj.setCreatedAt(curDate);
@@ -192,6 +195,11 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
                 dataObjList.add(dataObj);
                 dataObjList.add(dataObj);
             });
             });
 
 
+            List<AclPractitionerHiringWorkingExperience> resultList = workingExperienceMapper.selectByHiringBasicInfoId(basicInfoId);
+            if (CollectionUtils.isNotEmpty(resultList)) {
+                workingExperienceMapper.deleteBatchByIds(resultList);
+            }
+
             if (dataObjList.size() > 0) {
             if (dataObjList.size() > 0) {
                 workingExperienceMapper.batchInsert(dataObjList);
                 workingExperienceMapper.batchInsert(dataObjList);
             }
             }
@@ -299,28 +307,31 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
     public SavePersonalStatementsResponseVO savePersonalStatements(SavePersonalStatementsRequestVO requestVO) {
     public SavePersonalStatementsResponseVO savePersonalStatements(SavePersonalStatementsRequestVO requestVO) {
         SavePersonalStatementsResponseVO resp = new SavePersonalStatementsResponseVO();
         SavePersonalStatementsResponseVO resp = new SavePersonalStatementsResponseVO();
         try {
         try {
-            List<PractitionerHiringPersonalStatements> personalStatementList = requestVO.getPersonalStatementList();
-
-            List<AclPractitionerHiringPersonalStatements> dataObjList = new ArrayList<>();
+            List<AclPractitionerHiringPersonalStatements> personalStatementList = requestVO.getPersonalStatementList();
+            Long basicInfoId = requestVO.getHiringBasicInfoId();
 
 
             Date curDate = new Date();
             Date curDate = new Date();
             personalStatementList.forEach(item -> {
             personalStatementList.forEach(item -> {
-                AclPractitionerHiringPersonalStatements dataObj = new AclPractitionerHiringPersonalStatements();
-                BeanUtils.copyProperties(item, dataObj);
 
 
-                dataObj.setIsActive(1);
+                item.setHiringBasicInfoId(basicInfoId);
+                item.setIsActive(1);
 
 
-                dataObj.setCreatedAt(curDate);
-                dataObj.setUpdatedAt(curDate);
+                item.setCreatedAt(curDate);
+                item.setUpdatedAt(curDate);
 
 
-                dataObj.setCreatedBy((long) -1);
-                dataObj.setUpdatedBy((long) -1);
+                item.setCreatedBy((long) -1);
+                item.setUpdatedBy((long) -1);
 
 
-                dataObjList.add(dataObj);
             });
             });
 
 
-            if (dataObjList.size() > 0) {
-                personalStatementsMapper.batchInsert(dataObjList);
+            List<AclPractitionerHiringPersonalStatements> resultList = personalStatementsMapper.selectByHiringBasicInfoId(basicInfoId);
+            if (CollectionUtils.isNotEmpty(resultList)) {
+                // 先删除
+                personalStatementsMapper.deleteBatchByIds(resultList);
+            }
+            // 插入
+            if (personalStatementList.size() > 0) {
+                personalStatementsMapper.batchInsert(personalStatementList);
             }
             }
 
 
             resp.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
             resp.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
@@ -336,28 +347,30 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
     public SaveContractTermsConfirmsResponseVO saveContractTermsConfirms(SaveContractTermsConfirmsRequestVO requestVO) {
     public SaveContractTermsConfirmsResponseVO saveContractTermsConfirms(SaveContractTermsConfirmsRequestVO requestVO) {
         SaveContractTermsConfirmsResponseVO resp = new SaveContractTermsConfirmsResponseVO();
         SaveContractTermsConfirmsResponseVO resp = new SaveContractTermsConfirmsResponseVO();
         try {
         try {
-            List<PractitionerHiringContractTermsConfirms> contractTermsConfirmsList = requestVO.getContractTermsConfirmsList();
-
-            List<AclPractitionerHiringContractTermsConfirms> dataObjList = new ArrayList<>();
+            List<AclPractitionerHiringContractTermsConfirms> contractTermsConfirmsList = requestVO.getContractTermsConfirmsList();
+            Long basicInfoId = requestVO.getHiringBasicInfoId();
 
 
             Date curDate = new Date();
             Date curDate = new Date();
             contractTermsConfirmsList.forEach(item -> {
             contractTermsConfirmsList.forEach(item -> {
-                AclPractitionerHiringContractTermsConfirms dataObj = new AclPractitionerHiringContractTermsConfirms();
-                BeanUtils.copyProperties(item, dataObj);
 
 
-                dataObj.setIsActive(1);
+                item.setHiringBasicInfoId(basicInfoId);
+                item.setIsActive(1);
 
 
-                dataObj.setCreatedAt(curDate);
-                dataObj.setUpdatedAt(curDate);
+                item.setCreatedAt(curDate);
+                item.setUpdatedAt(curDate);
 
 
-                dataObj.setCreatedBy((long) -1);
-                dataObj.setUpdatedBy((long) -1);
+                item.setCreatedBy((long) -1);
+                item.setUpdatedBy((long) -1);
 
 
-                dataObjList.add(dataObj);
             });
             });
 
 
-            if (dataObjList.size() > 0) {
-                contractTermsConfirmsMapper.batchInsert(dataObjList);
+            List<AclPractitionerHiringContractTermsConfirms> resultList = contractTermsConfirmsMapper.selectByHiringBasicInfoId(basicInfoId);
+            if (CollectionUtils.isNotEmpty(resultList)) {
+                contractTermsConfirmsMapper.deleteBatchByIds(resultList);
+            }
+
+            if (contractTermsConfirmsList.size() > 0) {
+                contractTermsConfirmsMapper.batchInsert(contractTermsConfirmsList);
             }
             }
 
 
             resp.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
             resp.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));

yd-api/src/main/java/com/yd/api/practitioner/vo/hiring/SaveContractTermsConfirmsRequestVO.java

 package com.yd.api.practitioner.vo.hiring;
 package com.yd.api.practitioner.vo.hiring;
 
 
-import com.yd.dal.entity.agms.hiring.PractitionerHiringContractTermsConfirms;
+import com.yd.dal.entity.customer.AclPractitionerHiringContractTermsConfirms;
 import lombok.Data;
 import lombok.Data;
 
 
 import java.util.List;
 import java.util.List;
 
 
 @Data
 @Data
 public class SaveContractTermsConfirmsRequestVO {
 public class SaveContractTermsConfirmsRequestVO {
-    private List<PractitionerHiringContractTermsConfirms> contractTermsConfirmsList;
+    private Long hiringBasicInfoId;
+    private List<AclPractitionerHiringContractTermsConfirms> contractTermsConfirmsList;
 }
 }

yd-api/src/main/java/com/yd/api/practitioner/vo/hiring/SavePersonalStatementsRequestVO.java

 package com.yd.api.practitioner.vo.hiring;
 package com.yd.api.practitioner.vo.hiring;
 
 
-import com.yd.dal.entity.agms.hiring.PractitionerHiringPersonalStatements;
+import com.yd.dal.entity.customer.AclPractitionerHiringPersonalStatements;
 import lombok.Data;
 import lombok.Data;
 
 
 import java.util.List;
 import java.util.List;
 
 
 @Data
 @Data
 public class SavePersonalStatementsRequestVO {
 public class SavePersonalStatementsRequestVO {
-    private List<PractitionerHiringPersonalStatements> personalStatementList;
+    private Long hiringBasicInfoId;
+    private List<AclPractitionerHiringPersonalStatements> personalStatementList;
 }
 }
\ No newline at end of file

yd-api/src/main/java/com/yd/api/practitioner/vo/hiring/SaveWorkingExperienceRequestVO.java

@@ -7,5 +7,6 @@ import java.util.List;
 
 
 @Data
 @Data
 public class SaveWorkingExperienceRequestVO {
 public class SaveWorkingExperienceRequestVO {
+    private Long hiringBasicInfoId;
     private List<PractitionerHiringWorkingExperience> workingExperienceList;
     private List<PractitionerHiringWorkingExperience> workingExperienceList;
 }
 }

yd-api/src/main/java/com/yd/dal/entity/agms/hiring/PractitionerHiringPersonalStatements.java

@@ -5,11 +5,6 @@ package com.yd.dal.entity.agms.hiring;
  */
  */
 public class PractitionerHiringPersonalStatements {
 public class PractitionerHiringPersonalStatements {
     /**
     /**
-     * FK ag_acl_practitioner_hiring_basic_info.id
-     */
-    private Long hiringBasicInfoId;
-
-    /**
      * 个人申明条目
      * 个人申明条目
      */
      */
     private String personalStatements;
     private String personalStatements;
@@ -69,14 +64,6 @@ public class PractitionerHiringPersonalStatements {
                 '}';
                 '}';
     }
     }
 
 
-    public Long getHiringBasicInfoId() {
-        return hiringBasicInfoId;
-    }
-
-    public void setHiringBasicInfoId(Long hiringBasicInfoId) {
-        this.hiringBasicInfoId = hiringBasicInfoId;
-    }
-
     public String getUserInput() {
     public String getUserInput() {
         return userInput;
         return userInput;
     }
     }

yd-api/src/main/java/com/yd/dal/entity/agms/hiring/PractitionerHiringWorkingExperience.java

@@ -7,11 +7,6 @@ import java.util.Date;
  */
  */
 public class PractitionerHiringWorkingExperience {
 public class PractitionerHiringWorkingExperience {
     /**
     /**
-     * FK ag_acl_practitioner_hiring_basic_info.id
-     */
-    private Long hiringBasicInfoId;
-
-    /**
      * 工作单位
      * 工作单位
      */
      */
     private String workingCompany;
     private String workingCompany;
@@ -119,11 +114,4 @@ public class PractitionerHiringWorkingExperience {
                 '}';
                 '}';
     }
     }
 
 
-    public Long getHiringBasicInfoId() {
-        return hiringBasicInfoId;
-    }
-
-    public void setHiringBasicInfoId(Long hiringBasicInfoId) {
-        this.hiringBasicInfoId = hiringBasicInfoId;
-    }
 }
 }

yd-api/src/main/java/com/yd/dal/mapper/customer/AclPractitionerHiringContractTermsConfirmsMapper.java

@@ -24,4 +24,6 @@ public interface AclPractitionerHiringContractTermsConfirmsMapper {
     int batchInsert(@Param("list") List<AclPractitionerHiringContractTermsConfirms> list);
     int batchInsert(@Param("list") List<AclPractitionerHiringContractTermsConfirms> list);
 
 
     List<AclPractitionerHiringContractTermsConfirms> selectByHiringBasicInfoId(Long hiringBasicInfoId);
     List<AclPractitionerHiringContractTermsConfirms> selectByHiringBasicInfoId(Long hiringBasicInfoId);
+
+    void deleteBatchByIds(List<AclPractitionerHiringContractTermsConfirms> resultList);
 }
 }
\ No newline at end of file

yd-api/src/main/java/com/yd/dal/mapper/customer/AclPractitionerHiringPersonalStatementsMapper.java

@@ -24,4 +24,6 @@ public interface AclPractitionerHiringPersonalStatementsMapper {
     int batchInsert(@Param("list") List<AclPractitionerHiringPersonalStatements> list);
     int batchInsert(@Param("list") List<AclPractitionerHiringPersonalStatements> list);
 
 
     List<AclPractitionerHiringPersonalStatements> selectByHiringBasicInfoId(Long hiringBasicInfoId);
     List<AclPractitionerHiringPersonalStatements> selectByHiringBasicInfoId(Long hiringBasicInfoId);
+
+    void deleteBatchByIds(List<AclPractitionerHiringPersonalStatements> resultList);
 }
 }
\ No newline at end of file

yd-api/src/main/java/com/yd/dal/mapper/customer/AclPractitionerHiringWorkingExperienceMapper.java

@@ -24,4 +24,6 @@ public interface AclPractitionerHiringWorkingExperienceMapper {
     int batchInsert(@Param("list") List<AclPractitionerHiringWorkingExperience> list);
     int batchInsert(@Param("list") List<AclPractitionerHiringWorkingExperience> list);
 
 
     List<AclPractitionerHiringWorkingExperience> selectByHiringBasicInfoId(Long hiringBasicInfoId);
     List<AclPractitionerHiringWorkingExperience> selectByHiringBasicInfoId(Long hiringBasicInfoId);
+
+    void deleteBatchByIds(List<AclPractitionerHiringWorkingExperience> resultList);
 }
 }
\ No newline at end of file

yd-api/src/main/resources/mapper/customer/AclPractitionerHiringContractTermsConfirmsMapper.xml

@@ -278,4 +278,12 @@
     from ag_acl_practitioner_hiring_contract_terms_confirms
     from ag_acl_practitioner_hiring_contract_terms_confirms
     where hiring_basic_info_id = #{hiringBasicInfoId,jdbcType=BIGINT}
     where hiring_basic_info_id = #{hiringBasicInfoId,jdbcType=BIGINT}
   </select>
   </select>
+
+  <delete id="deleteBatchByIds">
+    delete from ag_acl_practitioner_hiring_contract_terms_confirms
+    where id in
+    <foreach close=")" collection="list" item="item" open="(" separator=", ">
+      #{item.id,jdbcType=BIGINT}
+    </foreach>
+  </delete>
 </mapper>
 </mapper>
\ No newline at end of file

yd-api/src/main/resources/mapper/customer/AclPractitionerHiringPersonalStatementsMapper.xml

@@ -300,4 +300,11 @@
     from  ag_acl_practitioner_hiring_personal_statements
     from  ag_acl_practitioner_hiring_personal_statements
     where hiring_basic_info_id = #{hiringBasicInfoId,jdbcType=BIGINT}
     where hiring_basic_info_id = #{hiringBasicInfoId,jdbcType=BIGINT}
   </select>
   </select>
+  <delete id="deleteBatchByIds">
+    delete from ag_acl_practitioner_hiring_personal_statements
+    where id in
+    <foreach close=")" collection="list" item="item" open="(" separator=", ">
+      #{item.id,jdbcType=BIGINT}
+    </foreach>
+  </delete>
 </mapper>
 </mapper>
\ No newline at end of file

yd-api/src/main/resources/mapper/customer/AclPractitionerHiringWorkingExperienceMapper.xml

@@ -349,4 +349,12 @@
     from  ag_acl_practitioner_hiring_working_experience
     from  ag_acl_practitioner_hiring_working_experience
     where hiring_basic_info_id = #{hiringBasicInfoId,jdbcType=BIGINT}
     where hiring_basic_info_id = #{hiringBasicInfoId,jdbcType=BIGINT}
   </select>
   </select>
+
+  <delete id="deleteBatchByIds">
+    delete from ag_acl_practitioner_hiring_working_experience
+    where id in
+    <foreach close=")" collection="list" item="item" open="(" separator=", ">
+      #{item.id,jdbcType=BIGINT}
+    </foreach>
+  </delete>
 </mapper>
 </mapper>
\ No newline at end of file