Merge branch 'dev_20201208_hiring' of http://139.224.139.2:9091/AGSH/yd-backend…

Merge branch 'dev_20201208_hiring' of http://139.224.139.2:9091/AGSH/yd-backend into dev_20201208_hiring

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

@@ -71,29 +71,50 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
     public SaveMembershipResponseVO saveMembership(SaveMembershipRequestVO requestVO) {
         SaveMembershipResponseVO resp = new SaveMembershipResponseVO();
         try {
-            // 先保存ag_acl_practitioner_hiring_basic_info，获取hiringBasicInfoId
-            AclPractitionerHiringBasicInfo basicInfo = new AclPractitionerHiringBasicInfo();
-            basicInfo.setName(requestVO.getName());
-            basicInfo.setPractitionerPotentialId(requestVO.getPractitionerPotentialId());
-            basicInfoMapper.insertSelective(basicInfo);
-
-            // 数据库实体
-            AclPractitionerHiringMembership membership = new AclPractitionerHiringMembership();
-            BeanUtils.copyProperties(requestVO, membership);
-            membership.setHiringBasicInfoId(basicInfo.getId());
-            membership.setIsActive(1);
-
-            Date curDate = new Date();
-            membership.setCreatedAt(curDate);
-            membership.setUpdatedAt(curDate);
-
-            Long loginId = requestVO.getLoginId();
-            membership.setCreatedBy(loginId);
-            membership.setUpdatedBy(loginId);
+            Long basicInfoId = requestVO.getHiringBasicInfoId();
+            AclPractitionerHiringBasicInfo basicInfo1 = basicInfoMapper.selectByPrimaryKey(basicInfoId);
+            if (basicInfo1 == null) {
+                // 先保存ag_acl_practitioner_hiring_basic_info，获取hiringBasicInfoId
+                AclPractitionerHiringBasicInfo basicInfo = new AclPractitionerHiringBasicInfo();
+                basicInfo.setName(requestVO.getName());
+                basicInfo.setPractitionerPotentialId(requestVO.getPractitionerPotentialId());
+                basicInfoMapper.insertSelective(basicInfo);
+                // 保存组织关系
+                AclPractitionerHiringMembership membership = new AclPractitionerHiringMembership();
+                BeanUtils.copyProperties(requestVO, membership);
+                membership.setHiringBasicInfoId(basicInfo.getId());
+                membership.setIsActive(1);
+
+                Date curDate = new Date();
+                membership.setCreatedAt(curDate);
+                membership.setUpdatedAt(curDate);
+
+                Long loginId = requestVO.getLoginId();
+                membership.setCreatedBy(loginId);
+                membership.setUpdatedBy(loginId);
+                membershipMapper.insertSelective(membership);
+
+                resp.setHiringBasicInfoId(basicInfo.getId());
 
-            membershipMapper.insertSelective(membership);
+            } else {
+                // 仅需更新组织关系
+                AclPractitionerHiringMembership membership = membershipMapper.selectByHiringBasicInfoId(basicInfoId);
+                BeanUtils.copyProperties(requestVO, membership);
+                membership.setHiringBasicInfoId(basicInfo1.getId());
+                membership.setIsActive(1);
+
+                Date curDate = new Date();
+                membership.setCreatedAt(curDate);
+                membership.setUpdatedAt(curDate);
+
+                Long loginId = requestVO.getLoginId();
+                membership.setCreatedBy(loginId);
+                membership.setUpdatedBy(loginId);
+                membershipMapper.insertSelective(membership);
+
+                resp.setHiringBasicInfoId(basicInfo1.getId());
+            }
 
-            resp.setHiringBasicInfoId(basicInfo.getId());
             resp.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
         } catch (Exception e) {
             e.printStackTrace();
@@ -508,4 +529,5 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
         SimpleDateFormat sdf = new SimpleDateFormat("yyMMdd");
         return targetUseFor+sdf.format(new Date()) + CommonUtil.getRandomNum(3)+".jpg";
     }
+
 }

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

@@ -25,4 +25,6 @@ public interface AclPractitionerHiringMembershipMapper {
     int batchInsert(@Param("list") List<AclPractitionerHiringMembership> list);
 
     AclPractitionerHiringMembership queryByhiringBasicInfoId(QueryMembershipRequestVO requestVO);
+
+    AclPractitionerHiringMembership selectByHiringBasicInfoId(Long basicInfoId);
 }
\ No newline at end of file

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

@@ -524,4 +524,11 @@
         #{item.updatedAt,jdbcType=TIMESTAMP}, #{item.updatedBy,jdbcType=BIGINT})
     </foreach>
   </insert>
+
+  <select id="selectByHiringBasicInfoId" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from ag_acl_practitioner_hiring_membership
+    where hiring_basic_info_id = #{basicInfoId,jdbcType=BIGINT}
+  </select>
 </mapper>
\ No newline at end of file