修改查询列表,修改审核接口

ruoyi-admin/src/main/java/com/ruoyi/web/controller/projectV2/common/ZsyzCommonController.java

@@ -55,9 +55,9 @@ public class ZsyzCommonController extends BaseController {
      * 首页统计
      * @return
      */
-    @GetMapping("/census")
-    public AjaxResult census() {
-        return  zsyzCommonService.census();
+    @PostMapping("/census")
+    public AjaxResult census(@RequestBody ZsyzSbbzb zsyzSbbzb) {
+        return  zsyzCommonService.census(zsyzSbbzb);
     }
 
     /**

ruoyi-system/src/main/java/com/ruoyi/system/domain/projectV2/ZsyzKgxx.java

@@ -30,6 +30,18 @@ public class ZsyzKgxx extends BaseEntity
     @Excel(name = "项目编号")
     private String xmbh;
 
+    /**
+     * 项目线索名称
+     */
+    private String xmxsmc;
+
+    public String getXmxsmc() {
+        return xmxsmc;
+    }
+
+    public void setXmxsmc(String xmxsmc) {
+        this.xmxsmc = xmxsmc;
+    }
     /** 项目名称 */
     @Excel(name = "项目名称")
     private String xmmc;
@@ -197,6 +209,7 @@ public class ZsyzKgxx extends BaseEntity
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())
             .append("remark", getRemark())
+                .append("xmxsmc", getXmxsmc())
             .toString();
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/projectV2/ZsyzQyxx.java

@@ -30,6 +30,19 @@ public class ZsyzQyxx extends BaseEntity
     @Excel(name = "项目编号")
     private String xmbh;
 
+    /**
+     * 项目线索名称
+     */
+    private String xmxsmc;
+
+    public String getXmxsmc() {
+        return xmxsmc;
+    }
+
+    public void setXmxsmc(String xmxsmc) {
+        this.xmxsmc = xmxsmc;
+    }
+
     /** 项目名称 */
     @Excel(name = "项目名称")
     private String xmmc;
@@ -452,6 +465,7 @@ public class ZsyzQyxx extends BaseEntity
                 "id=" + id +
                 ", xmId=" + xmId +
                 ", xmbh='" + xmbh + '\'' +
+                ", xmxsmc='" + xmxsmc + '\'' +
                 ", xmmc='" + xmmc + '\'' +
                 ", dfqyr='" + dfqyr + '\'' +
                 ", wfqyr='" + wfqyr + '\'' +

ruoyi-system/src/main/java/com/ruoyi/system/domain/projectV2/ZsyzTcxx.java

@@ -30,6 +30,18 @@ public class ZsyzTcxx extends BaseEntity
     @Excel(name = "项目编号")
     private String xmbh;
 
+    /**
+     * 项目线索名称
+     */
+    private String xmxsmc;
+
+    public String getXmxsmc() {
+        return xmxsmc;
+    }
+
+    public void setXmxsmc(String xmxsmc) {
+        this.xmxsmc = xmxsmc;
+    }
     /** 项目名称 */
     @Excel(name = "项目名称")
     private String xmmc;
@@ -447,6 +459,7 @@ public class ZsyzTcxx extends BaseEntity
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())
             .append("remark", getRemark())
+            .append("xmxsmc", getXmxsmc())
             .toString();
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/projectV2/common/ZsyzCommonServiceImpL.java

@@ -20,6 +20,7 @@ import com.ruoyi.system.service.projectV2.IZsyzShyjService;
 import com.ruoyi.system.service.projectV2.common.IZsyzCommonService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -64,7 +65,7 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
         //先获取角色
         List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
         String roleName = "";
-        if (roles != null && roles.size() > 0){
+        if (roles != null && roles.size() > 0) {
             for (SysRole role : roles) {
                 roleName = role.getRoleKey();
             }
@@ -77,23 +78,23 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
         ZsyzSbbzb zsyzSbbzb = new ZsyzSbbzb();
         zsyzSbbzb.setId(zsyzShyj.getXmId());
         //如果是要素部门处理,需要修改中间表的回复字段
-        if (SZBM.equals(roleName)){
+        if (SZBM.equals(roleName)) {
             ZsyzProjectDept zsyzProjectDept = new ZsyzProjectDept();
             zsyzProjectDept.setXmId(zsyzShyj.getXmId());
             zsyzProjectDept.setDeptId(SecurityUtils.getDeptId());
             //查询是否回复过最新的一条
             ZsyzProjectDept zsyzProjectDeptOld = projectDeptService.selectZsyzProjectDeptByXmId(zsyzProjectDept);
-            if (zsyzProjectDeptOld != null && "Y".equals(zsyzProjectDeptOld.getIsHf())){
+            if (zsyzProjectDeptOld != null && "Y".equals(zsyzProjectDeptOld.getIsHf())) {
                 return AjaxResult.error("当前已审核");
             }
             projectDeptService.updateZsyzProjectDeptByXmId(zsyzProjectDept);
-        }else {
+        } else {
             if (ONE.equals(shjg)) {
                 //通过
                 //审核通过需要进入下一阶段/要素部门审核通过,不进行进度前进
                 //判断项目进度
                 String progressResult = changeProgress(progress, roleName);
-                if (ERROR.equals(progressResult)){
+                if (ERROR.equals(progressResult)) {
                     return AjaxResult.error("当前状态下您没有审核权限");
                 }
                 zsyzSbbzb.setProgress(progressResult);
@@ -101,7 +102,7 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
                 zsyzSbbzbMapper.updateZsyzSbbzbProgress(zsyzSbbzb);
             } else if (TWO.equals(shjg)) {
                 String progressResult = changeProgressBack(progress, roleName);
-                if (ERROR.equals(progressResult)){
+                if (ERROR.equals(progressResult)) {
                     return AjaxResult.error("当前状态下您没有审核权限");
                 }
                 //驳回
@@ -136,105 +137,101 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
      * @return
      */
     @Override
-    public AjaxResult census() {
+    public AjaxResult census(ZsyzSbbzb zsyzSbbzb) {
         Long deptId = SecurityUtils.getDeptId();
         //先去redis 中查询
-        Map<String, Object> map = redisCache.getCacheObject(INDEX+deptId);
-        if (map == null) {
-            map = new HashMap<>();
-            //定义返回值
-            int sk = 0;
-            SysUser currentUser = SecurityUtils.getLoginUser().getUser();
-            ZsyzSbbzb zsyzSbbzb = new ZsyzSbbzb();
-            List<ZsyzSbbzb> zsyzSbbzbs = new ArrayList<>();
-            String roleKey = "";
-            // 如果是超级管理员/管理员，则不过滤数据
-            List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
-            if (roles != null && roles.size() > 0) {
-                for (SysRole role : roles) {
-                    //获取角色的权限字符串
-                    roleKey = roleKey + "," + role.getRoleKey();
-                    if (MANAGE.equals(roleKey)) {
-                        roleKey = MANAGE;
-                        break;
-                    }
+        Map<String, Object> map = new HashMap<>();
+        map = new HashMap<>();
+        //定义返回值
+        int sk = 0;
+        SysUser currentUser = SecurityUtils.getLoginUser().getUser();
+        List<ZsyzSbbzb> zsyzSbbzbs = new ArrayList<>();
+        String roleKey = "";
+        // 如果是超级管理员/管理员，则不过滤数据
+        List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+        if (roles != null && roles.size() > 0) {
+            for (SysRole role : roles) {
+                //获取角色的权限字符串
+                roleKey = roleKey + "," + role.getRoleKey();
+                if (MANAGE.equals(roleKey)) {
+                    roleKey = MANAGE;
+                    break;
                 }
             }
-            boolean flag = true;
-            if (StringUtils.isNotNull(currentUser) && (!currentUser.isAdmin() || MANAGE.equals(roleKey))) {
-                //如果不是admin/或者平台管理员 判断是什么角色
-                if (StringUtils.isNotEmpty(roleKey)) {
-                    String[] split = roleKey.split(",");
-                    for (int i = 0; i < split.length; i++) {
-                        if (SZBM.equals(split[i])) {
-                            //如果是市直部门则包含承接地数据
-                            flag = false;
-                            break;
-                        }
+        }
+        boolean flag = true;
+        if (StringUtils.isNotNull(currentUser) && (!currentUser.isAdmin() || MANAGE.equals(roleKey))) {
+            //如果不是admin/或者平台管理员 判断是什么角色
+            if (StringUtils.isNotEmpty(roleKey)) {
+                String[] split = roleKey.split(",");
+                for (int i = 0; i < split.length; i++) {
+                    if (SZBM.equals(split[i])) {
+                        //如果是市直部门则包含承接地数据
+                        flag = false;
+                        break;
                     }
                 }
-                //如果是FALSE 则包含承接地
-                if (flag) {
-                    //只查询承接地数据
-                    zsyzSbbzb.setCjdId(deptId);
-                    zsyzSbbzbs = zsyzSbbzbMapper.selectZsyzSbbzbCjdList(zsyzSbbzb);
-                } else {
-                    zsyzSbbzb.setDeptId(deptId);
-                    //查询指派给市值
-                    zsyzSbbzbs = zsyzSbbzbMapper.selectZsyzSbbzbListByZp(zsyzSbbzb);
-                }
+            }
+            //如果是FALSE 则包含承接地
+            if (flag) {
+                //只查询承接地数据
+                zsyzSbbzb.setCjdId(deptId);
+                zsyzSbbzbs = zsyzSbbzbMapper.selectZsyzSbbzbCjdList(zsyzSbbzb);
             } else {
-                //如果是admin/或者平台管理员 获取到所有数据
-                zsyzSbbzbs = zsyzSbbzbMapper.selectZsyzSbbzbList(zsyzSbbzb);
-                //查询省库数据
-                ZsyzSkxm zsyzSkxm = new ZsyzSkxm();
-                zsyzSkxm.setDeptId(deptId);
-                List<ZsyzSkxm> zsyzSkxms = zsyzSkxmMapper.selectZsyzSkxmList(zsyzSkxm);
-                if (zsyzSkxms != null && zsyzSkxms.size() > 0) {
-                    sk = zsyzSkxms.size();
-                }
+                zsyzSbbzb.setDeptId(deptId);
+                //查询指派给市值
+                zsyzSbbzbs = zsyzSbbzbMapper.selectZsyzSbbzbListByZp(zsyzSbbzb);
             }
-            //对数据进行分组统计
-            int xs = 0;
-            int qy = 0;
-            int kg = 0;
-            int tc = 0;
-            int all = 0;
-            if (zsyzSbbzbs != null && zsyzSbbzbs.size() > 0) {
-                for (ZsyzSbbzb sbbzb : zsyzSbbzbs) {
-                    String progress = sbbzb.getProgress();
-                    if (ONE.equals(progress) || TWO.equals(progress) || THR.equals(progress) || FOR.equals(progress) || FIV.equals(progress)) {
-                        xs = xs + 1;
-                    } else if (SIX.equals(progress) || SEV.equals(progress)) {
-                        qy = qy + 1;
-                    } else if (EIG.equals(progress) || NIN.equals(progress)) {
-                        kg = kg + 1;
-                    } else if (TEN.equals(progress) || ELE.equals(progress)) {
-                        tc = tc + 1;
-                    }
-                }
-                all = zsyzSbbzbs.size();
+        } else {
+            //如果是admin/或者平台管理员 获取到所有数据
+            zsyzSbbzbs = zsyzSbbzbMapper.selectZsyzSbbzbList(zsyzSbbzb);
+            //查询省库数据
+            ZsyzSkxm zsyzSkxm = new ZsyzSkxm();
+            zsyzSkxm.setDeptId(deptId);
+            List<ZsyzSkxm> zsyzSkxms = zsyzSkxmMapper.selectZsyzSkxmList(zsyzSkxm);
+            if (zsyzSkxms != null && zsyzSkxms.size() > 0) {
+                sk = zsyzSkxms.size();
             }
-            map.put("xs", xs);
-            map.put("qy", qy);
-            map.put("kg", kg);
-            map.put("tc", tc);
-            map.put("sk", sk);
-            //todo 问题项目  只有要素部门意见不通过和承接地不承接的是问题项目
-            List<ZsyzShyj> zsyzShyjs = zsyzShyjService.selectZsyzShyjListByWt(new ZsyzShyj());
-            int wt = 0;
-            if (zsyzShyjs != null) {
-                wt = zsyzShyjs.size();
+        }
+        //对数据进行分组统计
+        int xs = 0;
+        int qy = 0;
+        int kg = 0;
+        int tc = 0;
+        int all = 0;
+        if (zsyzSbbzbs != null && zsyzSbbzbs.size() > 0) {
+            for (ZsyzSbbzb sbbzb : zsyzSbbzbs) {
+                String progress = sbbzb.getProgress();
+                if (ONE.equals(progress) || TWO.equals(progress) || THR.equals(progress) || FOR.equals(progress) || FIV.equals(progress)) {
+                    xs = xs + 1;
+                } else if (SIX.equals(progress) || SEV.equals(progress)) {
+                    qy = qy + 1;
+                } else if (EIG.equals(progress) || NIN.equals(progress)) {
+                    kg = kg + 1;
+                } else if (TEN.equals(progress) || ELE.equals(progress)) {
+                    tc = tc + 1;
+                }
             }
-            map.put("wt", wt);
-            //统计批示项目数量
-            ZsyzSbbzb zsyzSbb = new ZsyzSbbzb();
-            zsyzSbbzb.setDeptId(deptId);
-            long ps = zsyzSbbzbMapper.ldpsListCount(zsyzSbb);
-            map.put("ps", ps);
-            map.put("all", all);
-            redisCache.setCacheObject(INDEX+deptId, map, 1, TimeUnit.HOURS);
+            all = zsyzSbbzbs.size();
+        }
+        map.put("xs", xs);
+        map.put("qy", qy);
+        map.put("kg", kg);
+        map.put("tc", tc);
+        map.put("sk", sk);
+        //todo 问题项目  只有要素部门意见不通过和承接地不承接的是问题项目
+        List<ZsyzShyj> zsyzShyjs = zsyzShyjService.selectZsyzShyjListByWt(new ZsyzShyj());
+        int wt = 0;
+        if (zsyzShyjs != null) {
+            wt = zsyzShyjs.size();
         }
+        map.put("wt", wt);
+        //统计批示项目数量
+        ZsyzSbbzb zsyzSbb = new ZsyzSbbzb();
+        zsyzSbbzb.setDeptId(deptId);
+        long ps = zsyzSbbzbMapper.ldpsListCount(zsyzSbb);
+        map.put("ps", ps);
+        map.put("all", all);
         return AjaxResult.success(map);
     }
 
@@ -258,10 +255,10 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
         List<Map<String, Object>> dateList = new ArrayList<>();
         String year = DateUtils.getTime();
         //获取当前年
-        Map<String,Object> timeMapOne = new HashMap<>(2);
-        Map<String,Object> timeMapTwo = new HashMap<>(2);
-        Map<String,Object> timeMapThr= new HashMap<>(2);
-        Map<String,Object> timeMapFor = new HashMap<>(2);
+        Map<String, Object> timeMapOne = new HashMap<>(2);
+        Map<String, Object> timeMapTwo = new HashMap<>(2);
+        Map<String, Object> timeMapThr = new HashMap<>(2);
+        Map<String, Object> timeMapFor = new HashMap<>(2);
         timeMapOne.put("beginTime", year + "0101");
         timeMapOne.put("endTime", year + "0331");
         timeMapTwo.put("beginTime", year + "0401");
@@ -286,14 +283,14 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
                 for (ZsyzSbbzb sbbzb : zsyzSbbzbs) {
                     String progress = sbbzb.getProgress();
                     String xmjd = xmjd(progress);
-                    if (XMJD_XS.equals(xmjd)){
+                    if (XMJD_XS.equals(xmjd)) {
                         xsNub = xsNub + 1;
-                    }else if (XMJD_QY.equals(xmjd)){
-                        qyNub = qyNub +1;
-                    }else if (XMJD_KG.equals(xmjd)){
-                        kgNub = kgNub +1;
-                    }else if (XMJD_TC.equals(xmjd)){
-                        tcNub = tcNub +1;
+                    } else if (XMJD_QY.equals(xmjd)) {
+                        qyNub = qyNub + 1;
+                    } else if (XMJD_KG.equals(xmjd)) {
+                        kgNub = kgNub + 1;
+                    } else if (XMJD_TC.equals(xmjd)) {
+                        tcNub = tcNub + 1;
                     }
                 }
                 xs.add(xsNub);
@@ -306,21 +303,21 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
         yMpa.put("qy", qy);
         yMpa.put("kg", kg);
         yMpa.put("tc", tc);
-        map.put("y",yMpa);
+        map.put("y", yMpa);
         return AjaxResult.success(map);
     }
 
     //更改项目进度前进
-    public String changeProgress(String progress,String roleName) {
-        if (ONE.equals(progress) && (MANAGE.equals(roleName)||ADMIN.equals(roleName))) {
+    public String changeProgress(String progress, String roleName) {
+        if (ONE.equals(progress) && (MANAGE.equals(roleName) || ADMIN.equals(roleName))) {
             progress = TWO;
-        } else if (FOR.equals(progress) && (CJD.equals(roleName)|| ADMIN.equals(roleName))) {
+        } else if (FOR.equals(progress) && (CJD.equals(roleName) || ADMIN.equals(roleName))) {
             progress = FIV;
-        } else if (SIX.equals(progress) && (MANAGE.equals(roleName)||ADMIN.equals(roleName))) {
+        } else if (SIX.equals(progress) && (MANAGE.equals(roleName) || ADMIN.equals(roleName))) {
             progress = SEV;
-        } else if (EIG.equals(progress) && (MANAGE.equals(roleName)||ADMIN.equals(roleName))) {
+        } else if (EIG.equals(progress) && (MANAGE.equals(roleName) || ADMIN.equals(roleName))) {
             progress = NIN;
-        } else if (TEN.equals(progress) && (MANAGE.equals(roleName)||ADMIN.equals(roleName))) {
+        } else if (TEN.equals(progress) && (MANAGE.equals(roleName) || ADMIN.equals(roleName))) {
             progress = ELE;
         }//项目入归暂时保留
         else {
@@ -330,16 +327,16 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
     }
 
     //更改项目进度后退
-    public String changeProgressBack(String progress,String roleName) {
-        if (TWO.equals(progress) && (MANAGE.equals(roleName)||ADMIN.equals(roleName))) {
+    public String changeProgressBack(String progress, String roleName) {
+        if (TWO.equals(progress) && (MANAGE.equals(roleName) || ADMIN.equals(roleName))) {
             progress = ONE;
-        } else if (FOR.equals(progress) && (CJD.equals(roleName)|| ADMIN.equals(roleName))) {
+        } else if (FOR.equals(progress) && (CJD.equals(roleName) || ADMIN.equals(roleName))) {
             progress = TWO;
-        } else if (SIX.equals(progress) && (MANAGE.equals(roleName)||ADMIN.equals(roleName))) {
+        } else if (SIX.equals(progress) && (MANAGE.equals(roleName) || ADMIN.equals(roleName))) {
             progress = FIV;
-        } else if (EIG.equals(progress) && (MANAGE.equals(roleName)||ADMIN.equals(roleName))) {
+        } else if (EIG.equals(progress) && (MANAGE.equals(roleName) || ADMIN.equals(roleName))) {
             progress = SEV;
-        } else if (TEN.equals(progress) && (MANAGE.equals(roleName)||ADMIN.equals(roleName))) {
+        } else if (TEN.equals(progress) && (MANAGE.equals(roleName) || ADMIN.equals(roleName))) {
             progress = NIN;
         }//项目入归暂时保留
         else {

ruoyi-system/src/main/java/com/ruoyi/system/service/projectV2/common/IZsyzCommonService.java

@@ -20,7 +20,7 @@ public interface IZsyzCommonService
   public AjaxResult xssh(ZsyzShyj zsyzShyj);
 
   //首页统计接口
-  public AjaxResult census();
+  public AjaxResult census(ZsyzSbbzb zsyzSbbzb);
 
     //首页统计折线图
   public AjaxResult censusXy();

ruoyi-system/src/main/resources/mapper/system/projectV2/ZsyzKgxxMapper.xml

@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="xmId"    column="xm_id"    />
         <result property="xmbh"    column="xmbh"    />
+        <result property="xmxsmc"    column="xmxsmc"    />
         <result property="xmmc"    column="xmmc"    />
         <result property="kgrq"    column="kgrq"    />
         <result property="njgrq"    column="njgrq"    />
@@ -24,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectZsyzKgxxVo">
-        select id, xm_id, xmbh, xmmc, kgrq, njgrq, sscrq, ntcsj, rtsj, nrtsj, kggjrsjh, create_by, create_time, update_by, update_time, remark from zsyz_kgxx
+        select id, xm_id, xmbh,xmxsmc, xmmc, kgrq, njgrq, sscrq, ntcsj, rtsj, nrtsj, kggjrsjh, create_by, create_time, update_by, update_time, remark from zsyz_kgxx
     </sql>
 
     <select id="selectZsyzKgxxList" parameterType="ZsyzKgxx" resultMap="ZsyzKgxxResult">
@@ -32,6 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="xmId != null "> and xm_id = #{xmId}</if>
             <if test="xmbh != null  and xmbh != ''"> and xmbh = #{xmbh}</if>
+            <if test="xmxsmc != null  and xmxsmc != ''"> and xmxsmc = #{xmxsmc}</if>
             <if test="xmmc != null  and xmmc != ''"> and xmmc = #{xmmc}</if>
             <if test="kgrq != null "> and kgrq = #{kgrq}</if>
             <if test="njgrq != null "> and njgrq = #{njgrq}</if>
@@ -53,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="xmId != null">xm_id,</if>
             <if test="xmbh != null">xmbh,</if>
+            <if test="xmxsmc != null">xmxsmc,</if>
             <if test="xmmc != null">xmmc,</if>
             <if test="kgrq != null">kgrq,</if>
             <if test="njgrq != null">njgrq,</if>
@@ -70,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="xmId != null">#{xmId},</if>
             <if test="xmbh != null">#{xmbh},</if>
+            <if test="xmxsmc != null">#{xmxsmc},</if>
             <if test="xmmc != null">#{xmmc},</if>
             <if test="kgrq != null">#{kgrq},</if>
             <if test="njgrq != null">#{njgrq},</if>
@@ -91,6 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="xmId != null">xm_id = #{xmId},</if>
             <if test="xmbh != null">xmbh = #{xmbh},</if>
+            <if test="xmxsmc != null">xmxsmc = #{xmxsmc},</if>
             <if test="xmmc != null">xmmc = #{xmmc},</if>
             <if test="kgrq != null">kgrq = #{kgrq},</if>
             <if test="njgrq != null">njgrq = #{njgrq},</if>

ruoyi-system/src/main/resources/mapper/system/projectV2/ZsyzQyxxMapper.xml

@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="xmId"    column="xm_id"    />
         <result property="xmbh"    column="xmbh"    />
+        <result property="xmxsmc"    column="xmxsmc"    />
         <result property="xmmc"    column="xmmc"    />
         <result property="dfqyr"    column="dfqyr"    />
         <result property="wfqyr"    column="wfqyr"    />
@@ -45,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectZsyzQyxxVo">
-        select id, xm_id, xmbh, xmmc, dfqyr, wfqyr, tbrq, qyrq,xytzely, xytze, swzj, gdzctze, xmgjrxm,xmgjrzw,xmgjrsjh, xmszd, sshy, tzfs, jsfs, sfys, jsnr, zlcf,gdmj, zcqymc, zcrq, zczb, frdb, lxfs, jyfw, lxrq, nkgrq, path, create_by, create_time, update_by, update_time, remark from zsyz_qyxx
+        select id, xm_id, xmbh, xmxsmc,xmmc, dfqyr, wfqyr, tbrq, qyrq,xytzely, xytze, swzj, gdzctze, xmgjrxm,xmgjrzw,xmgjrsjh, xmszd, sshy, tzfs, jsfs, sfys, jsnr, zlcf,gdmj, zcqymc, zcrq, zczb, frdb, lxfs, jyfw, lxrq, nkgrq, path, create_by, create_time, update_by, update_time, remark from zsyz_qyxx
     </sql>
 
     <select id="selectZsyzQyxxList" parameterType="ZsyzQyxx" resultMap="ZsyzQyxxResult">
@@ -53,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="xmId != null "> and xm_id = #{xmId}</if>
             <if test="xmbh != null  and xmbh != ''"> and xmbh = #{xmbh}</if>
+            <if test="xmxsmc != null  and xmxsmc != ''"> and xmxsmc = #{xmxsmc}</if>
             <if test="xmmc != null  and xmmc != ''"> and xmmc = #{xmmc}</if>
             <if test="dfqyr != null  and dfqyr != ''"> and dfqyr = #{dfqyr}</if>
             <if test="wfqyr != null  and wfqyr != ''"> and wfqyr = #{wfqyr}</if>
@@ -96,6 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="xmId != null">xm_id,</if>
             <if test="xmbh != null">xmbh,</if>
             <if test="xmmc != null and xmmc != ''">xmmc,</if>
+            <if test="xmxsmc != null and xmxsmc != ''">xmxsmc,</if>
             <if test="dfqyr != null and dfqyr != ''">dfqyr,</if>
             <if test="wfqyr != null and wfqyr != ''">wfqyr,</if>
             <if test="tbrq != null">tbrq,</if>
@@ -133,6 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="xmId != null">#{xmId},</if>
             <if test="xmbh != null">#{xmbh},</if>
+            <if test="xmxsmc != null and xmxsmc != ''">#{xmxsmc},</if>
             <if test="xmmc != null and xmmc != ''">#{xmmc},</if>
             <if test="dfqyr != null and dfqyr != ''">#{dfqyr},</if>
             <if test="wfqyr != null and wfqyr != ''">#{wfqyr},</if>
@@ -175,6 +179,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="xmId != null">xm_id = #{xmId},</if>
             <if test="xmbh != null">xmbh = #{xmbh},</if>
+            <if test="xmxsmc != null and xmxsmc != ''">xmxsmc = #{xmxsmc},</if>
             <if test="xmmc != null and xmmc != ''">xmmc = #{xmmc},</if>
             <if test="dfqyr != null and dfqyr != ''">dfqyr = #{dfqyr},</if>
             <if test="wfqyr != null and wfqyr != ''">wfqyr = #{wfqyr},</if>

ruoyi-system/src/main/resources/mapper/system/projectV2/ZsyzSbbzbMapper.xml

@@ -403,56 +403,64 @@
     </select>
     <select id="selectZsyzSbbzbListByZp" resultType="com.ruoyi.system.domain.projectV2.ZsyzSbbzb">
         select s.id,
-               s.sbdw,
-               s.tbrq,
-               s.zszxfzr,
-               s.xmbh,
-               s.xmxsmc,
-               s.sfwlhxxxm,
-               s.yzdq_id,
-               s.yzdq_name,
-               s.yzss_name,
-               s.ntze,
-               s.cylx_id,
-               s.cylx_name,
-               s.xmlb,
-               s.tzlb,
-               s.nlhd,
-               s.czpt,
-               s.tzzt,
-               s.xmjz,
-               s.gtzzrsfzhm,
-               s.qytzrxyzdm,
-               s.qybj,
-               s.tzfjj,
-               s.sndxse,
-               s.sndnse,
-               s.tzrxm,
-               s.tzrzw,
-               s.tzrdh,
-               s.xmjj,
-               s.name,
-               s.strq,
-               s.phone,
-               s.zw,
-               s.user_id,
-               s.create_by,
-               s.type,
-               s.progress,
-               s.dept_id,
-               s.create_time,
-               s.update_by,
-               s.is_del,
-               s.update_time,
-               s.remark,
-               s.cjd_id,
-               s.cjd_name,
-               s.is_meet,
-               s.meet_remark
+        s.sbdw,
+        s.tbrq,
+        s.zszxfzr,
+        s.xmbh,
+        s.xmxsmc,
+        s.sfwlhxxxm,
+        s.yzdq_id,
+        s.yzdq_name,
+        s.yzss_name,
+        s.ntze,
+        s.cylx_id,
+        s.cylx_name,
+        s.xmlb,
+        s.tzlb,
+        s.nlhd,
+        s.czpt,
+        s.tzzt,
+        s.xmjz,
+        s.gtzzrsfzhm,
+        s.qytzrxyzdm,
+        s.qybj,
+        s.tzfjj,
+        s.sndxse,
+        s.sndnse,
+        s.tzrxm,
+        s.tzrzw,
+        s.tzrdh,
+        s.xmjj,
+        s.name,
+        s.strq,
+        s.phone,
+        s.zw,
+        s.user_id,
+        s.create_by,
+        s.type,
+        s.progress,
+        s.dept_id,
+        s.create_time,
+        s.update_by,
+        s.is_del,
+        s.update_time,
+        s.remark,
+        s.cjd_id,
+        s.cjd_name,
+        s.is_meet,
+        s.meet_remark
         from zsyz_project_dept d
-                 left join zsyz_sbbzb s on s.id = d.xm_id
+        left join zsyz_sbbzb s on s.id = d.xm_id
         where s.is_del = 'N'
-          and d.dept_id = #{deptId}
+        and d.dept_id = #{deptId}
+        <if test="xmxsmc != null  and xmxsmc != ''">and s.xmxsmc = #{xmxsmc}</if>
+        <if test="cjdId != null ">and cjd_id = #{cjdId}</if>
+        <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+            AND date_format(s.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+        </if>
+        <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+            AND date_format(s.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+        </if>
     </select>
     <select id="ldpsList" parameterType="ZsyzSbbzb" resultMap="ZsyzSbbzbResult">
         select s.id, s.sbdw, s.tbrq, s.zszxfzr, s.xmbh, s.xmxsmc, s.sfwlhxxxm, s.yzdq_id, s.yzdq_name, s.yzss_name,
@@ -635,7 +643,14 @@
         <include refid="selectZsyzSbbzbVo"/>
         <where>
             is_del = 'N'
+            <if test="xmxsmc != null  and xmxsmc != ''">and xmxsmc = #{xmxsmc}</if>
             <if test="cjdId != null ">and cjd_id = #{cjdId}</if>
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+                AND date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+            </if>
+            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+                AND date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+            </if>
         </where>
     </select>
 

ruoyi-system/src/main/resources/mapper/system/projectV2/ZsyzTcxxMapper.xml

@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="xmId"    column="xm_id"    />
         <result property="xmbh"    column="xmbh"    />
+        <result property="xmxsmc"    column="xmxsmc"    />
         <result property="xmmc"    column="xmmc"    />
         <result property="tcrq"    column="tcrq"    />
         <result property="rgsj"    column="rgsj"    />
@@ -42,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectZsyzTcxxVo">
-        select id, xm_id, xmbh, xmmc, tcrq, rgsj, nrgsj, tcgjrsjh, sjdze, ydmj, tdcr, xjcf, cftr, sbqd, sbfp, sbht, fkpz, zlcf, zlcftr, zlsbqd, zlsbfp, zlsbht, zlfkpz, sjss, lxy, jnsb, zbtr, ndsjss, qt, create_by, create_time, update_by, update_time, remark from zsyz_tcxx
+        select id, xm_id, xmbh, xmxsmc,xmmc, tcrq, rgsj, nrgsj, tcgjrsjh, sjdze, ydmj, tdcr, xjcf, cftr, sbqd, sbfp, sbht, fkpz, zlcf, zlcftr, zlsbqd, zlsbfp, zlsbht, zlfkpz, sjss, lxy, jnsb, zbtr, ndsjss, qt, create_by, create_time, update_by, update_time, remark from zsyz_tcxx
     </sql>
 
     <select id="selectZsyzTcxxList" parameterType="ZsyzTcxx" resultMap="ZsyzTcxxResult">
@@ -50,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="xmId != null "> and xm_id = #{xmId}</if>
             <if test="xmbh != null  and xmbh != ''"> and xmbh = #{xmbh}</if>
+            <if test="xmxsmc != null  and xmxsmc != ''"> and xmxsmc = #{xmxsmc}</if>
             <if test="xmmc != null  and xmmc != ''"> and xmmc = #{xmmc}</if>
             <if test="tcrq != null "> and tcrq = #{tcrq}</if>
             <if test="rgsj != null "> and rgsj = #{rgsj}</if>
@@ -89,6 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="xmId != null">xm_id,</if>
             <if test="xmbh != null">xmbh,</if>
+            <if test="xmxsmc != null and xmxsmc != ''">xmxsmc,</if>
             <if test="xmmc != null and xmmc != ''">xmmc,</if>
             <if test="tcrq != null">tcrq,</if>
             <if test="rgsj != null">rgsj,</if>
@@ -124,6 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="xmId != null">#{xmId},</if>
             <if test="xmbh != null">#{xmbh},</if>
+            <if test="xmxsmc != null and xmxsmc != ''">#{xmxsmc},</if>
             <if test="xmmc != null and xmmc != ''">#{xmmc},</if>
             <if test="tcrq != null">#{tcrq},</if>
             <if test="rgsj != null">#{rgsj},</if>
@@ -163,6 +167,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="xmId != null">xm_id = #{xmId},</if>
             <if test="xmbh != null">xmbh = #{xmbh},</if>
+            <if test="xmxsmc != null and xmxsmc != ''">xmxsmc = #{xmxsmc},</if>
             <if test="xmmc != null and xmmc != ''">xmmc = #{xmmc},</if>
             <if test="tcrq != null">tcrq = #{tcrq},</if>
             <if test="rgsj != null">rgsj = #{rgsj},</if>