Merge branch '20221128_sun修正补贴管理(旧)' of sckj/mz-cloud into master

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

@@ -135,4 +135,13 @@ public class ZwywBtglJewh extends BaseEntity
 
     @TableField(exist = false)
     private Boolean editFlg;
+
+    @TableField(exist = false)
+    private String slsj;
+
+    @TableField(exist = false)
+    private String xb;
+
+    @TableField(exist = false)
+    private String csrq;
 }

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

@@ -325,4 +325,7 @@ public class ZwywBtglJgbt extends BaseEntity
 
     @TableField(exist = false)
     private String sfje;
+
+    @TableField(exist = false)
+    private String slsj;
 }

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

@@ -79,6 +79,10 @@ public class ZwywBtglJgbthp extends BaseEntity
     @Digits(integer = 10,fraction = 2,message = "{实付资金}")
     private String sfje;
 
+    @Excel(name = "实付机构数量")
+    @ApiModelProperty(value = "实付机构数量")
+    private String jgsl;
+
     /** 生成时间 */
     @Excel(name = "生成时间")
     @ApiModelProperty(value = "生成时间")

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

@@ -123,4 +123,7 @@ public class ZwywBtglJgjewh extends BaseEntity
 
     @TableField(exist = false)
     private Boolean editFlg;
+
+    @TableField(exist = false)
+    private String slsj;
 }

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

@@ -88,4 +88,7 @@ public class ZwywBtglJgqd extends BaseEntity
 
     @TableField(exist = false)
     private Boolean editFlg;
+
+    @TableField(exist = false)
+    private String scsj;
 }

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

@@ -394,4 +394,7 @@ public class ZwywBtglLrbtgl extends BaseEntity
     private String sfje;
 
     private String status;
+
+    @TableField(exist = false)
+    private String slsj;
 }

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

@@ -119,6 +119,9 @@ public class ZwywBtglLrqdmx extends BaseEntity
     @Digits(integer = 10,fraction = 2,message = "{发放金额}")
     private String sfje;
 
+    @TableField(exist = false)
+    private String yfze;
+
     @TableField(exist = false)
     private String xzqhId;
 

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

@@ -75,6 +75,7 @@ public class ZwywBtglJgqdServiceImpl implements IZwywBtglJgqdService {
         res.forEach(r -> {
             r.setXzqhIds(sysDeptJlMapper.getXzqhIds(r.getSsqh()));
             r.setXzqhNames(sysDeptJlMapper.getXzqhNames(r.getSsqh()));
+            r.setScsj(r.getCreateTimeStr());
         });
         return res;
     }

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

@@ -88,7 +88,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             spsm,
             spjg,
             create_area_code,
-            STRCMP(create_area_code, #{xzqhId}) as editFlg
+            STRCMP(create_area_code, #{xzqhId}) as editFlg,
+            create_time_str as slsj,
+            (select xb from zwyw_btgl_lrbtgl where zjhm = zwyw_btgl_jewh.zjhm limit 1) as xb,
+            (select csrq from zwyw_btgl_lrbtgl where zjhm = zwyw_btgl_jewh.zjhm limit 1) as csrq
         FROM
             zwyw_btgl_jewh
         <where>

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

@@ -116,9 +116,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             frlxdh,
             shjg,
             create_area_code,
-            STRCMP(create_area_code, #{xzqhId}) as editFlg
+            STRCMP(create_area_code, #{xzqhId}) as editFlg,
+            create_time_str as slsj,
+            getxzqhmcbycode(create_area_code) AS slqhNames
         FROM
-        zwyw_btgl_jgbt
+            zwyw_btgl_jgbt
         <where>
             sljg = '1'
             and (status = '0' or status = '1')
@@ -140,9 +142,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             frlxdh,
             spjg,
             create_area_code,
-            STRCMP(create_area_code, #{xzqhId}) as editFlg
+            STRCMP(create_area_code, #{xzqhId}) as editFlg,
+            create_time_str as slsj,
+            getxzqhmcbycode(create_area_code) AS slqhNames
         FROM
-        zwyw_btgl_jgbt
+            zwyw_btgl_jgbt
         <where>
             sljg = '1' and shjg = '01'
             and (status = '0' or status = '1')

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

@@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectZwywBtglJgjewhList" parameterType="ZwywBtglJgjewh" resultMap="ZwywBtglJgjewhResult">
-        select id, jgmc, xydm, ssqh, btlx, ffzq, ffyf, btje, xgyy, bgsm, spsm, spjg, create_time_str, create_user_id, create_by, create_user_type,
+        select id, jgmc, xydm, ssqh, btlx, ffzq, ffyf, btje, xgyy, bgsm, spsm, spjg, create_time_str as slsj, create_user_id, create_by, create_user_type,
         create_area_code, STRCMP(create_area_code, #{xzqhId}) as editFlg, create_unit, create_unit_name, update_time_str, update_user_id, update_by, update_unit, update_unit_name from zwyw_btgl_jgjewh
         <where>
             <if test="jgmc != null  and jgmc != ''"> and jgmc = #{jgmc}</if>
@@ -70,7 +70,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             spsm,
             spjg,
             create_area_code,
-            STRCMP(create_area_code, #{xzqhId}) as editFlg
+            STRCMP(create_area_code, #{xzqhId}) as editFlg,
+            create_time_str as slsj
         FROM
             zwyw_btgl_jgjewh
          <where>

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

@@ -150,7 +150,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             btlx,
             shjg,
             create_area_code,
-            STRCMP(create_area_code, #{xzqhId}) as editFlg
+            STRCMP(create_area_code, #{xzqhId}) as editFlg,
+            create_time_str as slsj
         FROM
             zwyw_btgl_lrbtgl
         <where>
@@ -175,7 +176,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             btlx,
             spjg,
             create_area_code,
-            STRCMP(create_area_code, #{xzqhId}) as editFlg
+            STRCMP(create_area_code, #{xzqhId}) as editFlg,
+            create_time_str as slsj
         FROM
 	        zwyw_btgl_lrbtgl
         <where>
@@ -405,6 +407,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             xm,
             zjhm,
             btlx,
+            xb,
+            csrq,
             getxzqhmcbycode(create_area_code) AS slqhNames,
             YEAR(NOW()) - YEAR(SUBSTRING(zjhm,7,8)) AS age,
             ffzq,
@@ -417,7 +421,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             create_time_str,
             create_unit,
             create_area_code,
-            STRCMP(create_area_code, #{xzqhId}) as editFlg
+            STRCMP(create_area_code, #{xzqhId}) as editFlg,
+            create_time_str as slsj
         FROM
         zwyw_btgl_lrbtgl
         <where>

ruoyi-ui/src/views/business/btgl/jebg/index.vue

@@ -254,7 +254,7 @@ export default {
     getList() {
       this.loading = true
       listJewh(this.queryParams).then((response) => {
-        this.jewhList = decryptRowData_ECB(response.rows, [], [])
+        this.jewhList = decryptRowData_ECB(response.rows, ["xm", "zjhm"], [1, 2])
         this.total = response.total
         this.loading = false
       })
@@ -318,7 +318,7 @@ export default {
       this.reset()
       const id = row.id || this.ids
       getJewh(id).then((response) => {
-        this.form = decryptData_ECB(response.data, [], [])
+        this.form = decryptData_ECB(response.data, ["xm", "zjhm"], [1, 2])
         /****** sks 需要改动的地方 start ******/
         this.copyForm = this.deepCopy(response.data)
         /****** sks 需要改动的地方 end ******/
@@ -331,7 +331,7 @@ export default {
       this.reset()
       const id = row.id || this.ids
       getJewh(id).then((response) => {
-        this.xqForm = decryptData_ECB(response.data, [], [])
+        this.xqForm = decryptData_ECB(response.data, ["xm", "zjhm"], [1, 2])
         this.openXQ = true
         console.log(this.form)
       })

ruoyi-ui/src/views/business/btgl/jebgsp/index.vue

@@ -35,6 +35,16 @@
           </el-table-column>
           <el-table-column label="老人姓名" align="center" prop="xm" />
           <el-table-column label="身份证件号码" align="center" prop="zjhm" />
+          <el-table-column label="性别" align="center" prop="xb">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.C0007" :value="scope.row.xb" />
+            </template>
+          </el-table-column>
+          <el-table-column label="出生日期" align="center" prop="csrq" width="180">
+            <template slot-scope="scope">
+              <span>{{ special(scope.row.csrq) }}</span>
+            </template>
+          </el-table-column>
           <el-table-column label="发放年月" align="center" prop="ffny">
             <template v-slot="{ row }">
               {{ row.ffny | ffyfFilter }}
@@ -47,6 +57,11 @@
             </template>
           </el-table-column>
           <el-table-column label="补贴金额" align="center" prop="btje" />
+          <el-table-column label="受理日期" align="center" prop="slsj" width="180">
+            <template slot-scope="scope">
+              <span>{{ special(scope.row.slsj ? scope.row.slsj.substring(0,8) : '') }}</span>
+            </template> 
+          </el-table-column>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
             <template slot-scope="scope">
               <el-button v-if="!scope.row.spjg && !scope.row.editFlg" size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['business:jebgsp:edit']">修改/审核</el-button>
@@ -171,7 +186,7 @@ import { decryptData_ECB, decryptRowData_ECB } from "@/api/tool/sm4";
 
 export default {
   name: 'jebgsp',
-  dicts: ['CZ002', 'CH016', 'XZ074', 'CH019'],
+  dicts: ['CZ002', 'CH016', 'XZ074', 'CH019', 'C0007'],
   data() {
     return {
       // 遮罩层
@@ -267,7 +282,7 @@ export default {
     getList() {
       this.loading = true
       selectBgspList(this.queryParams).then((response) => {
-        this.jewhList = decryptRowData_ECB(response.rows, [], [])
+        this.jewhList = decryptRowData_ECB(response.rows, ["xm", "zjhm"], [1, 2])
         this.total = response.total
         this.loading = false
       })
@@ -331,7 +346,7 @@ export default {
       this.reset()
       const id = row.id || this.ids
       getJewh(id).then((response) => {
-        this.form = decryptData_ECB(response.data, [], [])
+        this.form = decryptData_ECB(response.data, ["xm", "zjhm"], [1, 2])
         /****** sks 需要改动的地方 start ******/
         this.copyForm = this.deepCopy(response.data)
         /****** sks 需要改动的地方 end ******/
@@ -344,7 +359,7 @@ export default {
       this.reset()
       const id = row.id || this.ids
       getJewh(id).then((response) => {
-        this.xqForm = decryptData_ECB(response.data, [], [])
+        this.xqForm = decryptData_ECB(response.data, ["xm", "zjhm"], [1, 2])
         this.openXQ = true
       })
     },

ruoyi-ui/src/views/business/btgl/jgbthp/index.vue

@@ -62,11 +62,7 @@
           <el-table-column label="所属区划" align="center" prop="ssqhNames" />
           <el-table-column label="应付金额" align="center" prop="btje" />
           <el-table-column label="实付资金" align="center" prop="sfje" />
-          <el-table-column label="实付机构数量" align="center" prop="scsj" width="180">
-            <template slot-scope="scope">
-              <span>{{ special(scope.row.scsj) }}</span>
-            </template>
-          </el-table-column>
+          <el-table-column label="实付机构数量" align="center" prop="jgsl" />
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
             <template slot-scope="scope">
               <el-button size="mini" type="text" icon="el-icon-edit" @click="handleMx(scope.row)" v-hasPermi="['business:jgbthp:selectYhQdmxList']">明细</el-button>

ruoyi-ui/src/views/business/btgl/jgbtsh/index.vue

@@ -46,6 +46,12 @@
               <dict-tag :options="dict.type.XZ051" :value="scope.row.jglx" />
             </template>
           </el-table-column>
+          <el-table-column label="受理日期" align="center" prop="slsj" width="180">
+            <template slot-scope="scope">
+              <span>{{ special(scope.row.slsj ? scope.row.slsj.substring(0,8) : '') }}</span>
+            </template> 
+          </el-table-column>
+          <el-table-column label="受理区划" align="center" prop="slqhNames" />
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
             <template slot-scope="scope">
               <el-button v-if="!scope.row.shjg && !scope.row.editFlg" size="mini" type="text" icon="el-icon-edit"

ruoyi-ui/src/views/business/btgl/jgbtsp/index.vue

@@ -43,6 +43,12 @@
               <dict-tag :options="dict.type.XZ051" :value="scope.row.jglx" />
             </template>
           </el-table-column>
+          <el-table-column label="受理日期" align="center" prop="slsj" width="180">
+            <template slot-scope="scope">
+              <span>{{ special(scope.row.slsj ? scope.row.slsj.substring(0,8) : '') }}</span>
+            </template> 
+          </el-table-column>
+          <el-table-column label="受理区划" align="center" prop="slqhNames" />
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
             <template slot-scope="scope">
               <el-button v-if="!scope.row.spjg && !scope.row.editFlg" size="mini" type="text" icon="el-icon-edit"

ruoyi-ui/src/views/business/btgl/jgjebg/index.vue

@@ -52,6 +52,11 @@
           </el-table-column>
           <el-table-column label="补贴金额" align="center" prop="btje" />
           <el-table-column label="修改原因" align="center" prop="xgyy" />
+          <el-table-column label="受理日期" align="center" prop="slsj">
+		        <template v-slot="scope">
+			        <span>{{ special(scope.row.slsj ? scope.row.slsj.substring(0,8) : '') }}</span>
+		        </template>
+	        </el-table-column>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
             <template slot-scope="scope">
               <el-button v-if="!scope.row.bgsm && !scope.row.editFlg" size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['business:jgjebg:edit']">处理</el-button>

ruoyi-ui/src/views/business/btgl/jgjesp/index.vue

@@ -48,6 +48,11 @@
           <el-table-column label="发放年月" align="center" prop="ffyf" />
           <el-table-column label="补贴金额" align="center" prop="btje" />
           <el-table-column label="修改原因" align="center" prop="xgyy" />
+          <el-table-column label="受理日期" align="center" prop="slsj">
+		        <template v-slot="scope">
+			        <span>{{ special(scope.row.slsj ? scope.row.slsj.substring(0,8) : '') }}</span>
+		        </template>
+	        </el-table-column>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
             <template slot-scope="scope">
               <el-button v-if="!scope.row.spjg && !scope.row.editFlg" size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['business:jgjesp:edit']">修改/审核</el-button>

ruoyi-ui/src/views/business/btgl/jgqd/index.vue

@@ -52,6 +52,11 @@
           <el-table-column label="所属区划" align="center" prop="xzqhNames" />
           <el-table-column label="总机构数" align="center" prop="zjgs" />
           <el-table-column label="总金额" align="center" prop="zje" />
+          <el-table-column label="生成时间" align="center" prop="scsj">
+		        <template v-slot="scope">
+			        <span>{{ special(scope.row.scsj ? scope.row.scsj.substring(0,8) : '') }}</span>
+		        </template>
+	        </el-table-column>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
             <template slot-scope="scope">
               <el-button size="mini" type="text" icon="el-icon-edit" @click="handleMx(scope.row)" v-hasPermi="['business:jgqd:selectQdmxList']">明细</el-button>

ruoyi-ui/src/views/business/btgl/lrbtsh/index.vue

@@ -55,9 +55,9 @@
               <dict-tag :options="dict.type.CH016" :value="scope.row.btlx" />
             </template>
           </el-table-column>
-          <el-table-column label="审核结果" align="center" prop="shjg">
+          <el-table-column label="受理日期" align="center" prop="slsj">
             <template slot-scope="scope">
-              <dict-tag :options="dict.type.CZ002" :value="scope.row.shjg" />
+              <span>{{ special(scope.row.slsj ? scope.row.slsj.substring(0,8) : '') }}</span>
             </template>
           </el-table-column>
           <el-table-column width="150" label="操作" align="center" class-name="small-padding fixed-width" fixed="right">

ruoyi-ui/src/views/business/btgl/lrbtsp/index.vue

@@ -55,9 +55,9 @@
               <dict-tag :options="dict.type.CH016" :value="scope.row.btlx" />
             </template>
           </el-table-column>
-          <el-table-column label="审批结果" align="center" prop="spjg">
+          <el-table-column label="受理日期" align="center" prop="slsj">
             <template slot-scope="scope">
-              <dict-tag :options="dict.type.XZ074" :value="scope.row.spjg" />
+              <span>{{ special(scope.row.slsj ? scope.row.slsj.substring(0,8) : '') }}</span>
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">

ruoyi-ui/src/views/business/btgl/lrhc/index.vue

@@ -47,7 +47,7 @@
           </el-table-column>
           <el-table-column label="补贴金额" align="center" prop="btje" />
           <el-table-column label="发放金额" align="center" prop="sfje" />
-
+          <el-table-column label="应发总额" align="center" prop="yfze" />
           <el-table-column label="核查结果" align="center" prop="hcjg">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.CH040" :value="scope.row.hcjg" />

ruoyi-ui/src/views/business/btgl/tfsp/index.vue

@@ -35,12 +35,27 @@
           </el-table-column>
           <el-table-column label="姓名" align="center" prop="xm" />
           <el-table-column label="证件号码" align="center" prop="zjhm" />
+          <el-table-column label="性别" align="center" prop="xb">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.C0007" :value="scope.row.xb" />
+            </template>
+          </el-table-column>
+          <el-table-column label="出生日期" align="center" prop="csrq" width="180">
+            <template slot-scope="scope">
+              <span>{{ special(scope.row.csrq) }}</span>
+            </template>
+          </el-table-column>
           <el-table-column label="补贴类型" align="center" prop="btlx">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.CH016" :value="scope.row.btlx" />
             </template>
           </el-table-column>
-          <el-table-column label="受理区划" align="center" prop="slqhNames" />
+          <el-table-column label="受理日期" align="center" prop="slsj" width="180">
+            <template slot-scope="scope">
+              <span>{{ special(scope.row.slsj ? scope.row.slsj.substring(0,8) : '') }}</span>
+            </template>
+          </el-table-column>
+          <!-- <el-table-column label="受理区划" align="center" prop="slqhNames" />
           <el-table-column label="补贴金额" align="center" prop="btzj" />
           <el-table-column label="发放周期" align="center" prop="ffzq">
             <template slot-scope="scope">
@@ -56,7 +71,7 @@
             <template slot-scope="scope">
               <span>{{ special(scope.row.tyrq) }}</span>
             </template>
-          </el-table-column>
+          </el-table-column> -->
 
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="120">
             <template slot-scope="scope">