Merge branch '单-缺陷修正' of sckj/mz-cloud into master

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

@@ -1,10 +1,13 @@
 package com.ruoyi.business.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.business.domain.ZwywTsxdCwjs;
 import com.ruoyi.business.mapper.ZwywTsxdCwjsMapper;
 import com.ruoyi.business.service.IZwywTsxdCwjsService;
+import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.system.utils.SubCodeUtil;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -67,6 +70,13 @@ public class ZwywTsxdCwjsServiceImpl implements IZwywTsxdCwjsService
     @Override
     public int insertZwywTsxdCwjs(ZwywTsxdCwjs zwywTsxdCwjs)
     {
+        LambdaQueryWrapper<ZwywTsxdCwjs> lqw = new LambdaQueryWrapper<ZwywTsxdCwjs>()
+                .eq(ZwywTsxdCwjs::getXmId,zwywTsxdCwjs.getXmId())
+                .eq(ZwywTsxdCwjs::getXzqh,zwywTsxdCwjs.getXzqh())
+                .eq(ZwywTsxdCwjs::getSjjzrq,zwywTsxdCwjs.getSjjzrq());
+        if (ObjectUtils.isNotEmpty(zwywTsxdCwjsMapper.selectOne(lqw))) {
+            throw new ServiceException("当前数据已填报，不能新增！");
+        }
         return zwywTsxdCwjsMapper.insert(zwywTsxdCwjs);
     }
 

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

@@ -89,9 +89,9 @@ public class ZwywTsxdSnlrmxServiceImpl implements IZwywTsxdSnlrmxService
     @Override
     public void checkExist(ZwywTsxdSnlrmx zwywTsxdSnlrmx) {
         LambdaQueryWrapper<ZwywTsxdSnlrmx> lqw = new LambdaQueryWrapper<ZwywTsxdSnlrmx>()
-                .eq(ZwywTsxdSnlrmx::getSfzhm,zwywTsxdSnlrmx.getSfzhm())
-                .eq(ZwywTsxdSnlrmx::getRkId,zwywTsxdSnlrmx.getRkId())
-                .ne(ObjectUtil.isNotEmpty(zwywTsxdSnlrmx.getId()),ZwywTsxdSnlrmx::getId,zwywTsxdSnlrmx.getId());
+                        .eq(ZwywTsxdSnlrmx::getSfzhm,zwywTsxdSnlrmx.getSfzhm())
+                        .eq(ZwywTsxdSnlrmx::getRkId,zwywTsxdSnlrmx.getRkId())
+                        .ne(ObjectUtil.isNotEmpty(zwywTsxdSnlrmx.getId()),ZwywTsxdSnlrmx::getId,zwywTsxdSnlrmx.getId());
         boolean exists = zwywTsxdSnlrmxMapper.existsV(lqw);
         if (exists){
             throw new ServiceException("该身份证号码已存在,请勿录入重复信息");

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/controller/ZwywTsxdCwjsController.java

@@ -1,6 +1,8 @@
 package com.ruoyi.business.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.business.domain.ZwywTsxdCwjs;
+import com.ruoyi.business.domain.ZwywTsxdSnlrmx;
 import com.ruoyi.business.service.IZwywTsxdCwjsService;
 import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
@@ -11,6 +13,7 @@ import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.ruoyi.system.validate.group.AddGroup;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -74,15 +77,6 @@ public class ZwywTsxdCwjsController extends BaseController
     @PostMapping
     public AjaxResult add(@Validated({AddGroup.class}) @RequestBody ZwywTsxdCwjs zwywTsxdCwjs)
     {
-        List<ZwywTsxdCwjs> list = zwywTsxdCwjsService.selectZwywTsxdCwjsList(zwywTsxdCwjs);
-        if (list.size()>0){
-            for (int i =0;i<list.size();i++){
-                String sjjzrq = list.get(i).getSjjzrq();
-                if (zwywTsxdCwjs.getSjjzrq().equals(sjjzrq)){
-                    throw new ServiceException("当前数据已填报，不能新增！");
-                }
-            }
-        }
         return toAjax(zwywTsxdCwjsService.insertZwywTsxdCwjs(zwywTsxdCwjs),zwywTsxdCwjs.getId());
     }
 

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

@@ -119,4 +119,7 @@ public class ZwywZhjgBzssqk extends BaseEntity
 
     @TableField(exist = false)
     private String szxzqhName;
+
+    @TableField(exist = false)
+    private String  hsbm;
 }

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

@@ -3,6 +3,7 @@ package com.ruoyi.business.service.impl;
 import com.ruoyi.business.domain.ZwywZhjgBzssqk;
 import com.ruoyi.business.mapper.ZwywZhjgBzssqkMapper;
 import com.ruoyi.business.service.IZwywZhjgBzssqkService;
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.mapper.SysDeptJlMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -51,7 +52,8 @@ public class ZwywZhjgBzssqkServiceImpl implements IZwywZhjgBzssqkService
         List<ZwywZhjgBzssqk> zwywZhjgBzssqks = zwywZhjgBzssqkMapper.selectZwywZhjgBzssqkList(zwywZhjgBzssqk);
         zwywZhjgBzssqks.forEach(z ->{
             z.setSzxzqhName(sysDeptJlMapper.getXzqhNames(z.getSzxzqh()));
-            z.setTjrq(z.getCreateTimeStr().substring(0,8));
+            z.setTjrq(z.getCreateTimeStr().substring(0,8));z.setCreateUnitName(z.getUpdateUnitName());
+            z.setHsbm(SecurityUtils.getUserUnitName());
         } );
         return zwywZhjgBzssqks;
     }

ruoyi-ui/src/views/business/fwjggl/ajgsx/zhjgbzssqk/index.vue

@@ -93,6 +93,7 @@
           </template>
         </el-table-column>
         <el-table-column label="等级有效期" align="center" prop="djyxq" />
+        <el-table-column label="核实部门" align="center" prop="hsbm" />
 <!--        <el-table-column label="等级评定组织方" align="center" prop="djpdzzf" />-->
 <!--        <el-table-column label="上传等级评定证书" align="center" prop="djpdzssc" />-->
         <el-table-column label="提交日期" align="center" prop="tjrq" width="180">
@@ -340,7 +341,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 投诉举报表格数据
+      // 标准实施情况表格数据
       bzssqkList: [],
       // 弹出层标题
       title: '',
@@ -464,8 +465,9 @@ export default {
       this.form.txdz = res.data.txdz
       this.form.jgId = res.data.id
       this.form.szxzqhName = res.data.szxzqhName
+
     },
-    /** 查询投诉举报列表 */
+    /** 查询标准实施情况列表 */
     getList() {
       this.loading = true
       this.queryParams.params = {}
@@ -501,6 +503,7 @@ export default {
         djpdzzf: null,
         djpdzssc: null,
         tjrq: null,
+        hsbm: null,
       }
       this.resetForm('form')
     },
@@ -544,7 +547,7 @@ export default {
         this.form.szxzqhName = this.jgData.szxzqhName
       }
       this.open = true
-      this.title = '添加投诉举报'
+      this.title = '添加标准实施情况'
     },
     handleDetails(row) {
       this.request.getBzssqk(row.id).then((response) => {
@@ -568,7 +571,7 @@ export default {
         this.copyForm = this.deepCopy(response.data)
         /****** sks 需要改动的地方 end ******/
         this.open = true
-        this.title = '处理投诉举报'
+        this.title = '处理标准实施情况'
       })
     },
     /** 提交按钮 */

ruoyi-ui/src/views/business/tsxdxm/cwgl/index.vue

@@ -1027,7 +1027,7 @@ export default {
       if (day >= 0 && day <= 9) {
         day = "0" + day;
       }
-      let time = year + month + day;
+      let time = year +""+ month + day;
       this.form.gxrq = time;
       this.title = "添加家庭养老床位建设质量管理信息";
     },

ruoyi-ui/src/views/business/tsxdxm/cwjs/index.vue

@@ -302,6 +302,7 @@ export default {
       this.form.mc=this.xmData.mc;
       this.form.xzqhName = this.xzqhName;
       this.form.xzqh = this.user.userData.dept.locationCode;
+      console.log(this.form.xzqh)
       this.form.xmId=this.xmData.value;
       this.open = true;
       let year = new Date().getFullYear();
@@ -313,7 +314,7 @@ export default {
       if (day >= 0 && day <= 9) {
         day = "0" + day;
       }
-      let time = year + month + day;
+      let time = year +""+ month + day;
       this.form.gxrq = time;
       this.title = "添加家庭养老床位建设情况";
     },
@@ -356,7 +357,7 @@ export default {
             }
             /****** sks 需要改动的地方 end ******/
           } else {
-
+            console.log(this.form.xzqh)
             addCwjs(this.form).then(response => {
               this.$modal.msgSuccess((sbzt==0) ? "上报成功" : "新增成功");
               this.open = false;

ruoyi-ui/src/views/business/tsxdxm/jjhsq/index.vue

@@ -257,7 +257,7 @@ export default {
       if (day >= 0 && day <= 9) {
         day = "0" + day;
       }
-      let time = year + month + day;
+      let time = year +""+ month + day;
       this.form.gxrq = time;
       this.title = "添加居家和社区养老基本体系建设情况";
     },

ruoyi-ui/src/views/business/tsxdxm/lnrk/index.vue

@@ -486,7 +486,7 @@ export default {
       if (day >= 0 && day <= 9) {
         day = "0" + day;
       }
-      let time = year + month + day;
+      let time = year +""+ month + day;
       this.form.gxrq = time;
       this.title = "添加老年人口及社区机构和设施情况";
     },

ruoyi-ui/src/views/business/tsxdxm/pyyj/index.vue

@@ -353,7 +353,7 @@ export default {
       if (day >= 0 && day <= 9) {
         day = "0" + day;
       }
-      let time = year + month + day;
+      let time = year +""+ month + day;
       this.form.gxrq = time;
       this.title = "添加培育或引进专业机构情况";
     },

ruoyi-ui/src/views/business/tsxdxm/smfw/index.vue

@@ -567,7 +567,7 @@ export default {
       if (day >= 0 && day <= 9) {
         day = "0" + day;
       }
-      let time = year + month + day;
+      let time = year +""+ month + day;
       this.form.gxrq = time;
       this.title = "添加居家养老上门服务质量管理";
     },