项目信息模糊查询

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcContractController.java

@@ -145,7 +145,7 @@ public class CmcContractController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody CmcContract cmcContract)
     {
-        if (cmcContract.getManagerComment() != null && cmcContract.getGmComment() == null) {
+        if (cmcContract.getManagerComment() != null && cmcContract.getGmComment() == null && getLoginUser().getUserId() != 22) {
             cmcContract.setManagerUserId(getLoginUser().getUserId());
         }
         if (cmcContract.getGmComment() != null && cmcContract.getSignDate() == null && getLoginUser().getUserId() != 22) {

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectController.java

@@ -82,6 +82,21 @@ public class CmcProjectController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 模糊查询cmc项目列表
+     */
+    @GetMapping("/listFuzzy")
+    public TableDataInfo listFuzzy(String queryString)
+    {
+        startPage();
+        List<CmcProject> list = cmcProjectService.selectCmcProjectListFuzzy(queryString);
+        for (CmcProject project : list) {
+            project.setUndertakingDeptName(deptIdToName(project));
+            project.setQualityInspectorName(inspectorIdToName(project));
+        }
+        return getDataTable(list);
+    }
+
     /**
      * 导出cmc项目列表
      */

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcSubContractController.java

@@ -146,10 +146,10 @@ public class CmcSubContractController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody CmcSubContract cmcSubContract)
     {
-        if (cmcSubContract.getManagerComment() != null && cmcSubContract.getGmComment() == null) {
+        if (cmcSubContract.getManagerComment() != null && cmcSubContract.getGmComment() == null && getLoginUser().getUserId() != 22) {
             cmcSubContract.setManagerUserId(getLoginUser().getUserId());
         }
-        if (cmcSubContract.getGmComment() != null && cmcSubContract.getSignDate() == null) {
+        if (cmcSubContract.getGmComment() != null && cmcSubContract.getSignDate() == null && getLoginUser().getUserId() != 22) {
             cmcSubContract.setGmUserId(getLoginUser().getUserId());
         }
         return toAjax(cmcSubContractService.updateCmcSubContract(cmcSubContract));

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcProjectMapper.java

@@ -35,6 +35,14 @@ public interface CmcProjectMapper
      */
     public List<CmcProject> selectCmcProjectList(CmcProject cmcProject);
 
+    /**
+     * 模糊查询cmc测绘项目列表
+     *
+     * @param queryString 查询字符
+     * @return cmc项目集合
+     */
+    public List<CmcProject> selectCmcProjectListFuzzy(String queryString);
+
     /**
      * 查询cmc勘察项目列表
      *

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcProjectService.java

@@ -36,6 +36,14 @@ public interface ICmcProjectService
      */
     public List<CmcProject> selectCmcProjectList(CmcProject cmcProject);
 
+    /**
+     * 模糊查询cmc测绘项目列表
+     *
+     * @param queryString 查询字符
+     * @return cmc项目集合
+     */
+    public List<CmcProject> selectCmcProjectListFuzzy(String queryString);
+
     /**
      * 查询cmc勘察项目列表
      *

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcProjectServiceImpl.java

@@ -58,6 +58,17 @@ public class CmcProjectServiceImpl implements ICmcProjectService
         return cmcProjectMapper.selectCmcProjectList(cmcProject);
     }
 
+    /**
+     * 模糊查询cmc测绘项目列表
+     *
+     * @param queryString 查询字符
+     * @return cmc项目集合
+     */
+    public List<CmcProject> selectCmcProjectListFuzzy(String queryString)
+    {
+        return cmcProjectMapper.selectCmcProjectListFuzzy(queryString);
+    }
+
     /**
      * 查询cmc勘察项目列表
      *

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcProjectMapper.xml

@@ -146,6 +146,20 @@
         order by p.register_time desc, p.project_number desc
     </select>
 
+    <select id="selectCmcProjectListFuzzy" parameterType="String" resultMap="CmcProjectResult">
+        <include refid="selectCmcProjectVo"/>
+        <where>
+            (p.project_number REGEXP '^[0-9]+W[0-9]' or p.project_number REGEXP '^[0-9]+C[0-9]') AND NOT (p.project_number REGEXP '[/\\*-]')
+            and (case when p.undertaking_dept not like concat('%', '113', '%') then p.undertaking_dept not like concat('%', '113', '%')
+            when p.undertaking_dept is null then p.undertaking_dept is null
+            when p.undertaking_dept like concat('%', '113', '%') then p.undertaking_dept like concat('%', ',', '%')
+            end)
+            and concat(p.project_number, p.project_name, pa.party_a_name, p.contact_person, p.telephone) like concat('%', #{param}, '%')
+        </where>
+        group by p.project_id
+        order by p.register_time desc, p.project_number desc
+    </select>
+
     <select id="selectCmcInvestProjectList" parameterType="CmcProject" resultMap="CmcProjectResult">
         <include refid="selectCmcProjectVo"/>
         <where>