等级评定结果录入+财务填报终版本

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

@@ -52,6 +52,9 @@ public class DjpdJglr extends BaseEntity
     @ApiModelProperty(value = "单位性质")
     private String dwxz;
 
+    @ApiModelProperty(value = "兴办主体")
+    private String xbzt;
+
     /** 统一社会信用代码 */
     @Excel(name = "统一社会信用代码")
     @ApiModelProperty(value = "统一社会信用代码", required = true)
@@ -364,4 +367,7 @@ public class DjpdJglr extends BaseEntity
     @TableField(exist = false)
     private String ly;
 
+    @TableField(exist = false)
+    private int sff;
+
 }

ruoyi-modules/mz-business-djpd/src/main/java/com/ruoyi/business/mapper/DjpdJglrMapper.java

@@ -43,6 +43,6 @@ public interface DjpdJglrMapper extends BaseMapperPlus<DjpdJglr> {
     public List<DjpdJglr> selectDjpdSlList(DjpdJglr djpdJglr);
 
     @InterceptorIgnore(tenantLine = "true")
-    public String selectJgDwxzByJgId(String id);
+    public Map<String,String> selectJgDwxzByJgId(String id);
 
 }

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

@@ -197,6 +197,19 @@ public class DjpdJglrServiceImpl implements IDjpdJglrService
                 lqw.le(DjpdJglr::getSqsj, djpdJglr.getParams().get("endSqsj").toString());
             }
         }
+
+        // 这个是根据页面的选择，来决定兴办主体的in的值
+        String xbztIn = djpdJglr.getXbzt();
+        List<String> xbztValues;
+        if ("1".equals(xbztIn)) {
+            xbztValues = Arrays.asList("01", "02","03");
+            lqw.in(DjpdJglr::getXbzt, xbztValues);
+        } else if ("2".equals(xbztIn)) {
+            xbztValues = Arrays.asList("04","05");
+            lqw.in(DjpdJglr::getXbzt, xbztValues);
+        }
+
+
         List<DjpdJglr> res = djpdJglrMapper.selectList(lqw);
         res.forEach(r -> {
             r.setSzxzqh(SysDeptJlUtils.getDeptCache(r.getSzxzqhId()));
@@ -227,7 +240,10 @@ public class DjpdJglrServiceImpl implements IDjpdJglrService
         if (ObjectUtils.isNotEmpty(djpdJglrMapper.checkExists(check))) {
             throw new ServiceException("已经存在评级流程，请不要重复提交");
         }
-        djpdJglr.setDwxz("1,2".contains(djpdJglrMapper.selectJgDwxzByJgId(djpdJglr.getJgId()).substring(0,1))?"公办":"民办");
+        Map<String,String>  map = djpdJglrMapper.selectJgDwxzByJgId(djpdJglr.getJgId());
+
+        djpdJglr.setDwxz("1,2".contains(map.get("dwxz").substring(0,1))?"公办":"民办");
+        djpdJglr.setXbzt(map.get("xbzt"));
         djpdJglr.setInstanceId(IdUtils.simpleUUID());
         djpdJglr.setSzxzqh(djpdJglr.getSzxzqhId());
         djpdJglr.setSqzt(ApplicationStatus.SAVE.getCode());

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

@@ -170,9 +170,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             jg_id = #{id} and pddj >= 3
     </select>
 
-    <select id="selectJgDwxzByJgId" parameterType="String" resultType="string">
+    <select id="selectJgDwxzByJgId" parameterType="String" resultType="java.util.HashMap">
         SELECT
-            dwxz
+            dwxz,xbzt
         FROM
             yljg_jcxx
         WHERE

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysCwxxTbController.java

@@ -50,7 +50,6 @@ public class SysCwxxTbController extends BaseController
     public int getCountByJgidTblx(SysCwxxTb sysCwxxTb)
     {
         int sss = sysCwxxTbService.getCountByJgidTblx(sysCwxxTb);
-        System.out.println("ssssssss    "  + sss);
         return sss;
     }
 

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysCwxxTb.java

@@ -35,7 +35,6 @@ public class SysCwxxTb extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 主键标识 */
-    @Excel(name = "主键标识")
     @TableId(value = "id",type = IdType.ASSIGN_UUID)
     @ApiModelProperty(value = "主键标识")
     private String id;
@@ -45,7 +44,6 @@ public class SysCwxxTb extends BaseEntity
     private String jgId;
 
     /** 填报类型 */
-    @Excel(name = "填报类型(月报、年报、季报)", dictType = "CWTB003")
     @DictV(type = "CWTB003",message = "{填报类型}")
     @ApiModelProperty(value = "填报类型")
     private String tblx;

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysCwxxTbServiceImpl.java

@@ -2,9 +2,12 @@ package com.ruoyi.system.service.impl;
 
 import java.util.List;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.util.ObjectUtil;
 import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.core.utils.DateUtils;
+import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import org.apache.catalina.security.SecurityUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,6 +45,12 @@ public class SysCwxxTbServiceImpl implements ISysCwxxTbService
     @Override
     public SysCwxxTb selectSysCwxxTbGetJbxx()
     {
+        SysCwxxTb sysCwxxTb = new SysCwxxTb();
+        sysCwxxTb.setJgId(SecurityUtils.getJgId());
+        List<SysCwxxTb> list =  sysCwxxTbMapper.selectCwXxTb(sysCwxxTb);
+        if (list.size()>0L){
+            return sysCwxxTbMapper.selectCwXxTb(sysCwxxTb).get(0);
+        }
         return sysCwxxTbMapper.selectSysCwxxTbGetJbxx(SecurityUtils.getJgId());
     }
 
@@ -105,12 +114,12 @@ public class SysCwxxTbServiceImpl implements ISysCwxxTbService
 //        if(resultCount>0){
 //            throw new ServiceException("选择填报的类型已存在，请在表格内容里修改对应的信息");
 //        }
-        LambdaQueryWrapper<SysCwxxTb> lqw = new LambdaQueryWrapper<SysCwxxTb>()
-                .eq(SysCwxxTb::getJgId,sysCwxxTb.getJgId())
-                .eq(SysCwxxTb::getTblx,sysCwxxTb.getTblx());
-        if(sysCwxxTbMapper.selectCount(lqw)>0){
-            throw new ServiceException("选择填报的类型已存在，请在表格内容里修改对应的信息");
-        }
+//        LambdaQueryWrapper<SysCwxxTb> lqw = new LambdaQueryWrapper<SysCwxxTb>()
+//                .eq(SysCwxxTb::getJgId,sysCwxxTb.getJgId())
+//                .eq(SysCwxxTb::getTblx,sysCwxxTb.getTblx());
+//        if(sysCwxxTbMapper.selectCount(lqw)>0){
+//            throw new ServiceException("选择填报的类型已存在，请在表格内容里修改对应的信息");
+//        }
         return sysCwxxTbMapper.insert(sysCwxxTb);
     }
 
@@ -123,6 +132,13 @@ public class SysCwxxTbServiceImpl implements ISysCwxxTbService
     @Override
     public int updateSysCwxxTb(SysCwxxTb sysCwxxTb)
     {
+        SysCwxxTb cwxx = sysCwxxTbMapper.selectCwXxTbById(sysCwxxTb.getId());
+        if(StringUtils.isNull(cwxx)){
+            SysCwxxTb cwxxOrg = sysCwxxTbMapper.selectSysCwxxTbGetJbxx(SecurityUtils.getJgId());
+            BeanUtil.copyProperties(sysCwxxTb,cwxxOrg,new CopyOptions().ignoreNullValue());
+            return insertSysCwxxTb(sysCwxxTb); // 这俩其中之一
+//            insertSysCwxxTb(cwxxOrg); // 这俩其中之一
+        }
         return sysCwxxTbMapper.updateById(sysCwxxTb);
     }
 

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysCwxxTbMapper.xml

@@ -102,7 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         getxzqhmcbycode(ssxzqh) as ssxzqh_name,
         getxzqhmcbycode(szxzqh) as szxzqh_name,
         a.id as jg_id , a.jlrq djsj, a.tyshxydm tyxydm, a.jgmc dwmc, a.frxm fddbr, a.txdz dz, substring(a.ssxzqh,1,6) dwszdxzqhdm,
-        a.frdjjg djbm, a.frlxfs dh, a.sczt bdlx,
+        a.frdjjg djbm, a.frlxfs dh, a.sczt bdlx, a.cwbj lx,
         ( case when SUBSTRING(dwxz,1,1) =3 then 10 when SUBSTRING(dwxz,1,1) =2 then 30 when dwxz =42 then 42  else null end) jglx,
         ( case when SUBSTRING(dwxz,1,1) =3 then 2 when SUBSTRING(dwxz,1,1) =2 then 1 when dwxz =42 then 3 else null	end	) xz,
         a.xbzt, a.yljgzyxkzh yljgzyxkzdjh, a.jzmj jgjzmj,

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

@@ -18,11 +18,6 @@
           {{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}
         </template>
       </el-table-column>
-      <el-table-column label="上报时段" align="center" prop="tblx">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.CWTB003" :value="scope.row.tblx"/>
-        </template>
-      </el-table-column>
       <el-table-column label="登记时间" align="center" prop="djsj" width="180">
         <template slot-scope="scope">
           <span>{{ special(scope.row.djsj) }}</span>
@@ -43,26 +38,6 @@
       </el-table-column>
     </el-table>
 
-    <el-dialog title="选择填报时段" :visible.sync="innerVisible">
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="填报时段" prop="tblx">
-          <!--          <el-input v-model="form.tblx" placeholder="请输入填报时段"/>-->
-          <el-select v-model="form.tblx" placeholder="请选择填报时段">
-            <el-option
-              v-for="dict in dict.type.CWTB003"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="innerVisible = false">取 消</el-button>
-        <el-button type="primary" :disabled="form.tblx?false:true" @click="handleAdd">确定</el-button>
-      </div>
-    </el-dialog>
-
     <!-- 添加或修改先进个人管理对话框 -->
     <el-dialog v-dialog-drag :title="title" :visible.sync="open" width="1600px" append-to-body>
       <el-form class="add-form" ref="form" :model="form" :rules="rules" :disabled="true" label-width="180px" :inline="true">
@@ -101,7 +76,7 @@ import { decryptData_ECB, decryptRowData_ECB } from "@/api/tool/sm4";
 
 export default {
   name: "Xjgrgl",
-  dicts: [ 'C0038','CH010','CWTB001','CWTB002','CWTB003','CWTB004','CWTB005'],
+  dicts: [ 'C0038','CH010','CWTB001','CWTB003','CWTB004','CWTB005'],
   data() {
     return {
       outerVisible: false,
@@ -179,7 +154,6 @@ export default {
         {
           label:'机构-基本信息',child:[
             {key:'djsj',label:'登记时间',value:'',type:'date'},
-            // {key:'tblx',label:'填报类型',value:'',type:'select',dict:'CWTB002'},
             {key:'djbm',label:'登记部门',value:''},
             {key:'tyxydm',label:'统一社会信用代码',value:''},
             {key:'dwmc',label:'单位名称',value:''},
@@ -396,26 +370,6 @@ export default {
         }
       })
     },
-    // /** 季度填报新增按钮操作 */
-    // handleAddJD() {
-    //   this.reset();
-    //   getJbxx().then(response => {
-    //     this.form = decryptData_ECB(response.data,["fddbr","dh", "dz"], [1, 3, 4])
-    //     this.form.tblx='02';
-    //   });
-    //   this.open = true;
-    //   this.title = "添加【季度】财政报表";
-    // },
-    // /** 年度填报新增按钮操作 */
-    // handleAddND() {
-    //   this.reset();
-    //   getJbxx().then(response => {
-    //     this.form = decryptData_ECB(response.data,["fddbr","dh", "dz"], [1, 3, 4])
-    //     this.form.tblx='03';
-    //   });
-    //   this.open = true;
-    //   this.title = "添加【年度】财政报表";
-    // },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();

ruoyi-ui/src/views/business/fwjggl/djpd/djpdJglr/index.vue

@@ -20,6 +20,17 @@
         </el-select>
       </el-form-item>
 
+      <el-form-item label="兴办主体" prop="xbzt" v-if="queryParams.dwxz==='公办'">
+        <el-select v-model="queryParams.xbzt" placeholder="请选择兴办主体" clearable>
+          <el-option
+            v-for="item in optionsXbzt"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+
       <el-form-item label="申请状态" prop="sqzt">
         <el-select v-model="queryParams.sqzt" placeholder="请选择申请状态" clearable>
           <el-option v-for="dict in dict.type.CZ013" :key="dict.value" :label="dict.label" :value="dict.value" />
@@ -64,6 +75,11 @@
       <el-table-column label="统一社会信用代码" align="center" prop="xydm" />
       <el-table-column label="单位名称" align="center" prop="dwmc" />
       <el-table-column label="单位性质" align="center" prop="dwxz" />
+      <el-table-column label="兴办主体" align="center" prop="xbzt">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.CH010" :value="scope.row.xbzt" />
+        </template>
+      </el-table-column>
       <el-table-column label="所在区划" align="center" prop="szxzqh" />
 	    <el-table-column label="申请人" align="center" prop="sqrxm" />
 
@@ -194,6 +210,7 @@ export default {
     'CZ035',
     'CZ013',
     'CZ012',
+    'CH010',
   ],
   data() {
     return {
@@ -204,6 +221,13 @@ export default {
         value: '民办',
         label: '民办'
       }],
+      optionsXbzt: [{
+        value: '1',
+        label: '县级及以上'
+      }, {
+        value: '2',
+        label: '乡镇街道级'
+      }],
       value: '',
       // 遮罩层
       loading: true,
@@ -235,6 +259,7 @@ export default {
         xydm: null,
         dwmc: null,
         dwxz: null,
+        xbzt: null,
         sqzt: null,
         sqdj: null,
       },
@@ -307,6 +332,7 @@ export default {
       this.form.xydm = res.data.tyshxydm
       this.form.dwmc = res.data.jgmc
       this.form.dwxz = res.data.dwxz
+      this.form.xbzt = res.data.xbzt
       this.form.jlrq = res.data.jlrq
       this.form.szxzqh = res.data.ssxzqh
       this.form.szxzqhId = res.data.ssxzqhCode
@@ -377,6 +403,7 @@ export default {
         xydm: null,
         dwmc: null,
         dwxz: null,
+        xbzt: null,
         jlrq: null,
         dwssxzqh: null,
         dwssxzqhId: null,
@@ -428,6 +455,10 @@ export default {
       } else {
         this.queryParams.szxzqhId = null
       }
+      if(this.queryParams.dwxz === '民办'){
+        this.queryParams.xbzt = null;
+      }
+
       this.getList()
     },
     /** 重置按钮操作 */
@@ -463,6 +494,7 @@ export default {
             this.form.xydm = res.data.tyshxydm
             this.form.dwmc = res.data.jgmc
             this.form.dwxz = res.data.dwxz
+            this.form.xbzt = res.data.xbzt
             this.form.jlrq = res.data.jlrq
             this.form.szxzqh = res.data.ssxzqh
             this.form.szxzqhId = res.data.ssxzqhCode

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

@@ -18,7 +18,7 @@
               <el-option v-for="dict in dictOpt[i.dict]" :key="dict.value" :label="dict.label" :value="dict.value">
               </el-option>
             </el-select>
-            <el-input v-else v-model="form[i.key]" :class="i.dw?'dw':''" :placeholder="'请输入'+i.label">
+            <el-input v-else v-model="form[i.key]" :class="i.dw?'dw':''" :disabled="!!i.disable" :placeholder="'请输入'+i.label">
               <template v-if="i.dw" slot="append">{{i.dw}}</template>
 
             </el-input>
@@ -178,16 +178,16 @@
               { key: 'djsj', label: '登记时间', value: '', type: 'date' },
               // {key:'tblx',label:'填报类型',value:'',type:'select',dict:'CWTB002'},
               { key: 'djbm', label: '登记部门', value: '' },
-              { key: 'tyxydm', label: '统一社会信用代码', value: '' },
-              { key: 'dwmc', label: '单位名称', value: '' },
+              { key: 'tyxydm', label: '统一社会信用代码', value: '' , disable:true},
+              { key: 'dwmc', label: '单位名称', value: '' , disable:true},
               { key: 'fddbr', label: '法定代表人', value: '' },
               { key: 'dz', label: '地址', value: '' },
-              { key: 'dwszdxzqhdm', label: '单位所在地行政区划代码', value: '' },
+              { key: 'dwszdxzqhdm', label: '单位所在地行政区划代码', value: '' , disable:true},
               // {key:'dwszdxzqhdm',label:'单位所在地行政区划代码',type:'RegionCascaderSelect',value:''},
               { key: 'dh', label: '电话', value: '' },
               { key: 'gmjjhyfl', label: '国民经济行业分类', value: '社会工作' },
               { key: 'jglx', label: '机构类型', value: '', type: 'select', dict: 'CWTB004' },
-              { key: 'lx', label: '类型', value: '社会福利院' },
+              { key: 'lx', label: '类型', value: '社会福利院', disable:true },
               {
                 key: 'xz', label: '性质', value: '', type: 'cascader', dict: 'CWTB005', props: {
                   emitPath: false,