Merge branch '陈航-机构备案-import-修改业务逻辑' of sckj/mz-cloud into master

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/domain/ZwywJgBn.java

@@ -310,12 +310,6 @@ public class ZwywJgBn extends BaseEntity
     @Size(max = 500, message = "{其他材料}")
     private String qtcl;
 
-    /** 回传回执单材料 */
-    @Excel(name = "回传回执单材料")
-    @ApiModelProperty(value = "回传回执单材料")
-    @Size(max = 500, message = "{回传回执单材料}")
-    private String hzdcl;
-
     /** 办理结果 */
     @Excel(name = "办理结果")
     @ApiModelProperty(value = "办理结果")
@@ -348,11 +342,6 @@ public class ZwywJgBn extends BaseEntity
     @Size(max = 400, message = "{办理意见}")
     private String blyj;
 
-    /** 备案办理日期 */
-    @ApiModelProperty(value = "备案办理日期")
-    @DateV(pattern = "yyyyMMdd", message = "{备案办理日期}")
-    private String bablrq;
-
     /** 备案日期 */
     @Excel(name = "备案日期")
     @ApiModelProperty(value = "备案日期")
@@ -409,6 +398,7 @@ public class ZwywJgBn extends BaseEntity
 
     /** 备案信息查询状态 0全部 1,只查询有结果的 */
     @ApiModelProperty(value = "备案信息查询状态")
+    @TableField(exist = false)
     private String bnCxzt;
 
     /** 流转状态 */

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/service/impl/ZwywJgBnServiceImpl.java

@@ -331,24 +331,24 @@ public class ZwywJgBnServiceImpl implements IZwywJgBnService
                     "createTimeStr","createUserId","createUserType","createBy","createUnit","createTounit","createUnitName",
                     "updateTimeStr","updateUserId","updateBy","updateUnit","updateUnitName");
             yljgJcxx.setId(jgId);
+            String dateNow = DateUtils.dateTime();
             if("1".equals(bnBg.getBnCjzt())){ // 登记的备案信息check
                 if("1".equals(zwywJgBn.getBljg())){ // 审核结果为通过
-                    zwywJgBn.setBablrq(DateUtils.dateTime());
-                    zwywJgBn.setBarq(DateUtils.dateTime());
+
+                    zwywJgBn.setBarq(dateNow);
 
                     // 备案申请审核结果为通过，则修改养老机构信息
                     yljgJcxx.setIsBa("1");
-                    yljgJcxx.setBasj(DateUtils.dateTime());
+                    yljgJcxx.setBasj(dateNow);
                     insertYljgJcxxUpdateHi(yljgJcxx);
                     yljgJcxxMapper.updateYljgJcxxByBaxx(yljgJcxx);
                 }
             }else if("2".equals(bnBg.getBnCjzt())){ // 变更的备案信息check
                 if("1".equals(zwywJgBn.getBljg())){ // 审核结果为通过
                     zwywJgBn.setBnLzzt("02");
-                    zwywJgBn.setBablrq(DateUtils.dateTime());
 
                     // 备案变更审核结果为通过，则修改养老机构信息
-                    yljgJcxx.setBgsj(DateUtils.dateTime());
+                    yljgJcxx.setBgsj(dateNow);
                     insertYljgJcxxUpdateHi(yljgJcxx);
                     yljgJcxxMapper.updateYljgJcxxByBaxx(yljgJcxx);
                 }else if ("2".equals(zwywJgBn.getBljg())){

ruoyi-modules/mz-business/src/main/resources/mapper/business/ZwywJgBnMapper.xml

@@ -43,7 +43,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="barLxfs"    column="bar_lxfs"    />
         <result property="barq"    column="barq"    />
         <result property="bnCjzt"    column="bn_cjzt"    />
-        <result property="bnCxzt"    column="bn_cxzt"    />
         <result property="babgXm"    column="babg_xm"    />
         <result property="babgZjlx"    column="babg_zjlx"    />
         <result property="babgSfzhm"    column="babg_sfzhm"    />
@@ -56,7 +55,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="bhsqs"    column="bhsqs"    />
         <result property="jgdjzs"    column="jgdjzs"    />
         <result property="cns"    column="cns"    />
-        <result property="hzdcl"    column="hzdcl"    />
         <result property="qtcl"    column="qtcl"    />
         <result property="bljg"    column="bljg"    />
         <result property="babtgyy"    column="babtgyy"    />
@@ -82,7 +80,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateUnit"    column="update_unit"    />
         <result property="updateUnitName"    column="update_unit_name"    />
-        <result property="bablrq"    column="bablrq"    />
     </resultMap>
 
 

ruoyi-ui/src/views/business/fwjggl/bn/index.vue

@@ -855,9 +855,6 @@ export default {
         cns: [
           // { required: true, message: '承诺书不能为空', trigger: 'blur' }
         ],
-        hzdcl: [
-          // { max: 100, message: '回传回执单材料不能超过100个字符', trigger: 'blur' }
-        ],
         qtcl: [
           // { max: 100, message: '其他材料不能超过100个字符', trigger: 'blur' }
         ],
@@ -998,7 +995,6 @@ export default {
             { type: 'text', data: '证件号码' }, { type: 'value', data: 'barZjhm' },
           ],
           [
-            { type: 'text', data: '备案办理日期' }, { type: 'date', data: 'bablrq' },
             { type: 'text', data: '备案人联系方式' }, { type: 'value', data: 'barLxfs' },
             { type: 'text', data: '申请渠道' }, { type: 'dict', data: 'sqqd', dict: 'XZ036' }
           ],
@@ -1515,7 +1511,6 @@ export default {
         bhsqs: null,
         jgdjzs: null,
         cns: null,
-        hzdcl: null,
         qtcl: null,
         bljg: null,
         jtclmc: null,

ruoyi-ui/src/views/organization/jggl/bn/index.vue

@@ -599,9 +599,6 @@ export default {
         cns: [
           { max: 100, message: '承诺书不能超过100个字符', trigger: 'blur'},
         ],
-        hzdcl: [
-          { max: 100, message: '回传回执单材料不能超过100个字符', trigger: 'blur'},
-        ],
         qtcl: [
           { max: 100, message: '其他材料不能超过100个字符', trigger: 'blur'},
         ],
@@ -698,7 +695,6 @@ export default {
         bhsqs: null,
         jgdjzs: null,
         cns: null,
-        hzdcl: null,
         qtcl: null,
         bljg: null,
         babtgyy: null,

ruoyi-ui/src/views/organization/zwyw/babgsq/module/index.vue

@@ -632,9 +632,6 @@ export default {
         cns: [
           // { required: true, message: '承诺书不能为空', trigger: 'blur' }
         ],
-        hzdcl: [
-          // { max: 100, message: '回传回执单材料不能超过100个字符', trigger: 'blur' }
-        ],
         qtcl: [
           // { max: 100, message: '其他材料不能超过100个字符', trigger: 'blur' }
         ],
@@ -775,7 +772,6 @@ export default {
             { type: 'text', data: '证件号码' }, { type: 'value', data: 'barZjhm' },
           ],
           [
-            { type: 'text', data: '备案办理日期' }, { type: 'date', data: 'bablrq' },
             { type: 'text', data: '备案人联系方式' }, { type: 'value', data: 'barLxfs' },
             { type: 'text', data: '申请渠道' }, { type: 'dict', data: 'sqqd', dict: 'XZ036' }
           ],
@@ -1190,7 +1186,6 @@ export default {
         bhsqs: null,
         jgdjzs: null,
         cns: null,
-        hzdcl: null,
         qtcl: null,
         bljg: null,
         jtclmc: null,

ruoyi-ui/src/views/search/xxcx/fwjg/baxx/babgcx/index.vue

@@ -358,9 +358,6 @@ export default {
         cns: [
           // { required: true, message: '承诺书不能为空', trigger: 'blur' }
         ],
-        hzdcl: [
-          // { max: 100, message: '回传回执单材料不能超过100个字符', trigger: 'blur' }
-        ],
         qtcl: [
           // { max: 100, message: '其他材料不能超过100个字符', trigger: 'blur' }
         ],
@@ -501,7 +498,6 @@ export default {
             { type: 'text', data: '证件号码' }, { type: 'value', data: 'barZjhm' },
           ],
           [
-            { type: 'text', data: '备案办理日期' }, { type: 'date', data: 'bablrq' },
             { type: 'text', data: '备案人联系方式' }, { type: 'value', data: 'barLxfs' },
             { type: 'text', data: '申请渠道' }, { type: 'dict', data: 'sqqd', dict: 'XZ036' }
           ],
@@ -781,7 +777,6 @@ export default {
         bhsqs: null,
         jgdjzs: null,
         cns: null,
-        hzdcl: null,
         qtcl: null,
         bljg: null,
         jtclmc: null,

ruoyi-ui/src/views/search/xxcx/fwjg/baxx/baxxcx/index.vue

@@ -350,9 +350,6 @@ export default {
         cns: [
           // { required: true, message: '承诺书不能为空', trigger: 'blur' }
         ],
-        hzdcl: [
-          // { max: 100, message: '回传回执单材料不能超过100个字符', trigger: 'blur' }
-        ],
         qtcl: [
           // { max: 100, message: '其他材料不能超过100个字符', trigger: 'blur' }
         ],
@@ -493,7 +490,6 @@ export default {
             { type: 'text', data: '证件号码' }, { type: 'value', data: 'barZjhm' },
           ],
           [
-            { type: 'text', data: '备案办理日期' }, { type: 'date', data: 'bablrq' },
             { type: 'text', data: '备案人联系方式' }, { type: 'value', data: 'barLxfs' },
             { type: 'text', data: '申请渠道' }, { type: 'dict', data: 'sqqd', dict: 'XZ036' }
           ],
@@ -772,7 +768,6 @@ export default {
         bhsqs: null,
         jgdjzs: null,
         cns: null,
-        hzdcl: null,
         qtcl: null,
         bljg: null,
         jtclmc: null,

ruoyi-ui/src/views/search/xxcx/fwjg/sqyljg/jbxx/index.vue

@@ -574,7 +574,6 @@ export default {
           bhsqs: null,
           jgdjzs: null,
           cns: null,
-          hzdcl: null,
           qtcl: null,
           bljg: null,
           babtgyy: null,

ruoyi-ui/src/views/search/xxcx/fwjg/yljg/jbxx/index.vue

@@ -660,9 +660,6 @@ export default {
         cns: [
           { max: 100, message: '承诺书不能超过100个字符', trigger: 'blur' },
         ],
-        hzdcl: [
-          { max: 100, message: '回传回执单材料不能超过100个字符', trigger: 'blur' },
-        ],
         qtcl: [
           { max: 100, message: '其他材料不能超过100个字符', trigger: 'blur' },
         ],
@@ -819,7 +816,6 @@ export default {
         bhsqs: null,
         jgdjzs: null,
         cns: null,
-        hzdcl: null,
         qtcl: null,
         bljg: null,
         babtgyy: null,