报聘经纪人合同上的居住地址修改

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

@@ -193,7 +193,7 @@ public class PractitionerHiringContractServiceImpl implements PractitionerHiring
 
         StringBuffer secondResidentAddress = new StringBuffer();
         secondResidentAddress.append(basicInfo.getProvinceName()).append(basicInfo.getCityName());
-        data.put("residentAddress", secondResidentAddress.toString());
+        data.put("residentAddress", basicInfo.getResidentAddress());
         data.put("mobileNo", basicInfo.getMobileNo());
         //7页
         data.put("firstParty", firstParty);
@@ -276,7 +276,7 @@ public class PractitionerHiringContractServiceImpl implements PractitionerHiring
         data.put("secondPartyIDNo", basicInfo.getIdNo());
         StringBuffer secondResidentAddress = new StringBuffer();
         secondResidentAddress.append(basicInfo.getProvinceName()).append(basicInfo.getCityName());
-        data.put("secondPartyAddress", secondResidentAddress.toString());
+        data.put("secondPartyAddress", basicInfo.getResidentAddress());
         data.put("secondMobileNo", basicInfo.getMobileNo());
 
 
@@ -465,12 +465,39 @@ public class PractitionerHiringContractServiceImpl implements PractitionerHiring
     private void setPersonalStatement(Map<String, String> images, Long hiringBasicInfoId, String checkFile, String unCheckFile) {
         List<AclPractitionerHiringPersonalStatements> statementsList = statementsMapper.selectByHiringBasicInfoId(hiringBasicInfoId);
 
-        images.put("secondPersonalStatement1", checkFile);
-        images.put("secondPersonalStatement2", checkFile);
-        images.put("secondPersonalStatement3", checkFile);
-        images.put("secondPersonalStatement4", checkFile);
-        images.put("secondPersonalStatement5", checkFile);
+        images.put("secondPersonalStatement1", unCheckFile);
+        images.put("secondPersonalStatement2", unCheckFile);
+        images.put("secondPersonalStatement3", unCheckFile);
+        images.put("secondPersonalStatement4", unCheckFile);
+        images.put("secondPersonalStatement5", unCheckFile);
         images.put("secondPersonalStatement6", unCheckFile);
+
+        String dropOptionCode = "";
+        Long status;
+        for (AclPractitionerHiringPersonalStatements statements : statementsList) {
+
+            dropOptionCode = statements.getDropOptionCode();
+            status = statements.getStatus();
+
+            if (dropOptionCode.equals("NO_CRIME_RECORD") && Long.valueOf("1").equals(status)) {
+                images.put("secondPersonalStatement1", checkFile);
+                continue;
+            }
+            if (dropOptionCode.equals("NO_LOST_CREDIT") && Long.valueOf("1").equals(status)) {
+                images.put("secondPersonalStatement2", checkFile);
+                continue;
+            }
+            if (dropOptionCode.equals("NO_PUBLIC_CREDIT_RECORD") && Long.valueOf("1").equals(status)) {
+                images.put("secondPersonalStatement3", checkFile);
+                continue;
+            }
+            if (dropOptionCode.equals("NO_REGISTER_SAME_TRADE") && Long.valueOf("1").equals(status)) {
+                images.put("secondPersonalStatement6", checkFile);
+                continue;
+            }
+
+        }
+
     }
 
     private void setIDType(Map<String, String> images, String idType, String checkFile, String unCheckFile) {

yd-api/src/main/java/com/yd/dal/entity/customer/AclPractitionerHiringPersonalStatements.java

@@ -29,6 +29,11 @@ public class AclPractitionerHiringPersonalStatements {
     private String mdDropOptionName;
 
     /**
+     * 选项代码
+     */
+    private String dropOptionCode;
+
+    /**
      * 个人申明条目,用户补充输入
      */
     private String userInput;

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

@@ -297,11 +297,27 @@
     </foreach>
   </insert>
 
-  <select id="selectByHiringBasicInfoId" resultMap="BaseResultMap">
-    select <include refid="Base_Column_List" />
-    from  ag_acl_practitioner_hiring_personal_statements
+  <resultMap id="BaseResultMap2" type="com.yd.dal.entity.customer.AclPractitionerHiringPersonalStatements">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="hiring_basic_info_id" jdbcType="BIGINT" property="hiringBasicInfoId" />
+    <result column="md_drop_option_id" jdbcType="BIGINT" property="mdDropOptionId" />
+    <result column="md_drop_option_name" jdbcType="VARCHAR" property="mdDropOptionName" />
+    <result column="status" jdbcType="BIGINT" property="status" />
+    <result column="is_active" jdbcType="INTEGER" property="isActive" />
+    <result column="user_input" jdbcType="INTEGER" property="userInput" />
+    <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
+    <result column="created_by" jdbcType="BIGINT" property="createdBy" />
+    <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
+    <result column="updated_by" jdbcType="BIGINT" property="updatedBy" />
+    <result column="drop_option_code" jdbcType="VARCHAR" property="dropOptionCode" />
+  </resultMap>
+  <select id="selectByHiringBasicInfoId" resultMap="BaseResultMap2">
+    select s.* , o.drop_option_code
+    from  ag_acl_practitioner_hiring_personal_statements s
+    left join ag_md_drop_options o on o.id = s.md_drop_option_id
     where hiring_basic_info_id = #{hiringBasicInfoId,jdbcType=BIGINT}
   </select>
+
   <delete id="deleteBatchByIds">
     delete from ag_acl_practitioner_hiring_personal_statements
     where id in