Merge branch '陈航-修改林哥提的问题' of sckj/mz-cloud into master

ruoyi-modules/mz-business-lrgl/src/main/resources/mapper/business/ZwywLrJbxxMapper.xml

@@ -155,6 +155,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="lrXm != null  and lrXm != ''"> and lr_xm like concat('%', #{lrXm}, '%')</if>
             <if test="isDb != null "> and is_db = #{isDb}</if>
             <if test="isTk != null "> and is_tk = #{isTk}</if>
+            <if test="isDsr != null "> and is_dsr = #{isDsr}</if>
             <if test="lzzt != null  and lzzt != ''"> and lzzt = #{lzzt}</if>
         </where>
     </select>

ruoyi-modules/mz-organization-rcyy/src/main/java/com/ruoyi/organization/service/impl/YljgJzxxServiceImpl.java

@@ -68,6 +68,9 @@ public class YljgJzxxServiceImpl implements IYljgJzxxService
     @Override
     public int updateYljgJzxx(YljgJzxx yljgJzxx)
     {
+        if (yljgJzxx.getJzje() == ""){
+            yljgJzxx.setJzje("0");
+        }
         return yljgJzxxMapper.updateById(yljgJzxx);
     }
 

ruoyi-modules/mz-organization-yggl/src/main/resources/mapper/organization/YljgYgJbxxMapper.xml

@@ -262,7 +262,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectSqYljgYgJbxxListBuss" parameterType="YljgYgJbxx" resultMap="YljgYgJbxxResult">
-        <include refid="selectYljgYgJbxxBussVo"/>
+        select
+        b.jgmc, getxzqhmcbycode(b.szxzqh) szxzqh_name,
+        a.id, xm, a.sfzlx, a.sfzhm, a.csrq, a.xb, a.lxdh, a.whcd, a.shbn, a.zzzt, a.lzsj, a.zylx, a.zylx_qt, a.gwlx,
+        a.is_hlyyzs, a.is_jnsb, a.hlydj, a.gq_hlydj, a.jg_id, a.zw,
+        a.create_time_str, a.create_user_id, a.create_by, a.create_unit, a.create_unit_name,
+        a.update_time_str, a.update_user_id, a.update_by, a.update_unit, a.update_unit_name, a.state,
+        c.zzmc
+        from yljg_yg_jbxx a
+        LEFT JOIN yljgsq_jcxx b ON a.jg_id = b.id
+        LEFT JOIN yljg_bmxx c ON a.shbn = c.id
         <where>
             a.create_user_type = '02'
             AND b.sczt = '01'

ruoyi-modules/mz-system-ext/src/main/java/com/ruoyi/system/service/impl/SysGgxxServiceImpl.java

@@ -68,6 +68,32 @@ public class SysGgxxServiceImpl implements ISysGgxxService
     @Override
     public int insertSysGgxx(SysGgxx sysGgxx)
     {
+        updateTzfwCode(sysGgxx);
+        return sysGgxxMapper.insert(sysGgxx);
+    }
+
+    /**
+     * 修改公告维护
+     *
+     * @param sysGgxx 公告维护
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public int updateSysGgxx(SysGgxx sysGgxx)
+    {
+        if( StringUtils.isNotNull(sysGgxx.getTzfw())){
+            updateTzfwCode(sysGgxx);
+        }
+        if(StringUtils.isNotNull(sysGgxx.getZt())){
+            if (sysGgxx.getZt().equals("1")){ // 下发通知了
+                sysGgxx.setTzsj(DateUtils.dateTime());
+            }
+        }
+        return sysGgxxMapper.updateById(sysGgxx);
+    }
+
+    private void updateTzfwCode(SysGgxx sysGgxx) {
         sysGgxx.setTzhx(sysGgxx.getTzfw());
         String[] codes = sysGgxx.getTzfw().split(",");
 
@@ -105,25 +131,6 @@ public class SysGgxxServiceImpl implements ISysGgxxService
             }
         }
         sysGgxx.setTzfw(tzfwCodes);
-        return sysGgxxMapper.insert(sysGgxx);
-    }
-
-    /**
-     * 修改公告维护
-     *
-     * @param sysGgxx 公告维护
-     * @return 结果
-     */
-    @Override
-    @Transactional
-    public int updateSysGgxx(SysGgxx sysGgxx)
-    {
-        if(StringUtils.isNotNull(sysGgxx.getZt())){
-            if (sysGgxx.getZt().equals("1")){ // 下发通知了
-                sysGgxx.setTzsj(DateUtils.dateTime());
-            }
-        }
-        return sysGgxxMapper.updateById(sysGgxx);
     }
 
     /**

ruoyi-ui/src/api/search/jzxxHcjl.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询核查记录列表
 export function listJzxxHcjl(query) {
   return request({
-    url: '/search/jzxxHcjl/list',
+    url: '/business/jzxxHcjl/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listJzxxHcjl(query) {
 // 查询核查记录详细
 export function getJzxxHcjl(id) {
   return request({
-    url: '/search/jzxxHcjl/' + id,
+    url: '/business/jzxxHcjl/' + id,
     method: 'get'
   })
 }

ruoyi-ui/src/api/search/xxcx/fwjg/zhjg.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询核查记录列表
 export function listJzxxHcjlCx(query) {
   return request({
-    url: '/organization/jzxxHcjl/list',
+    url: '/business/jzxxHcjl/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listJzxxHcjlCx(query) {
 // 查询核查记录详细
 export function getJzxxHcjlCx(id) {
   return request({
-    url: '/organization/jzxxHcjl/' + id,
+    url: '/business/jzxxHcjl/' + id,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getJzxxHcjlCx(id) {
 // 新增核查记录
 export function addJzxxHcjlCx(data) {
   return request({
-    url: '/organization/jzxxHcjl',
+    url: '/business/jzxxHcjl',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addJzxxHcjlCx(data) {
 // 修改核查记录
 export function updateJzxxHcjlCx(data) {
   return request({
-    url: '/organization/jzxxHcjl',
+    url: '/business/jzxxHcjl',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateJzxxHcjlCx(data) {
 // 删除核查记录
 export function delJzxxHcjlCx(id) {
   return request({
-    url: '/organization/jzxxHcjl/' + id,
+    url: '/business/jzxxHcjl/' + id,
     method: 'delete'
   })
 }
@@ -196,7 +196,7 @@ export function listZhjgtsjbCx(query) {
 // 查询投诉举报详细
 export function getZhjgtsjbCx(id) {
   return request({
-    url: '/organization/zhjgtsjb/' + id,
+    url: '/business/zhjgtsjb/' + id,
     method: 'get'
   })
 }
@@ -204,7 +204,7 @@ export function getZhjgtsjbCx(id) {
 // 新增投诉举报
 export function addZhjgtsjbCx(data) {
   return request({
-    url: '/organization/zhjgtsjb',
+    url: '/business/zhjgtsjb',
     method: 'post',
     data: data
   })
@@ -213,7 +213,7 @@ export function addZhjgtsjbCx(data) {
 // 修改投诉举报
 export function updateZhjgtsjbCx(data) {
   return request({
-    url: '/organization/zhjgtsjb',
+    url: '/business/zhjgtsjb',
     method: 'put',
     data: data
   })
@@ -222,7 +222,7 @@ export function updateZhjgtsjbCx(data) {
 // 删除投诉举报
 export function delZhjgtsjbCx(id) {
   return request({
-    url: '/organization/zhjgtsjb/' + id,
+    url: '/business/zhjgtsjb/' + id,
     method: 'delete'
   })
 }

ruoyi-ui/src/api/search/xxcx/fwxm.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询服务项目维护列表
 export function listFwxm(query) {
   return request({
-    url: '/business/fwxm/list',
+    url: '/organization/fwxm/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listFwxm(query) {
 // 查询服务项目维护详细
 export function getFwxm(id) {
   return request({
-    url: '/business/fwxm/' + id,
+    url: '/organization/fwxm/' + id,
     method: 'get'
   })
 }

ruoyi-ui/src/api/search/xxcx/zhjgtsjb.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询投诉举报列表
 export function listZhjgtsjb(query) {
   return request({
-    url: '/search/zhjgtsjb/list',
+    url: '/business/zhjgtsjb/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listZhjgtsjb(query) {
 // 查询投诉举报详细
 export function getZhjgtsjb(id) {
   return request({
-    url: '/search/zhjgtsjb/' + id,
+    url: '/business/zhjgtsjb/' + id,
     method: 'get'
   })
 }

ruoyi-ui/src/views/search/xxcx/fwjg/zhjg/index.vue

@@ -3,11 +3,6 @@
     <el-row :gutter="20">
       <el-col :span="4" :xs="24">
         <span class="sxzd">所在行政区划</span>
-<<<<<<< .mine
-        <span class="sxzd">所在行政区划</span>
-=======
-
->>>>>>> .theirs
         <dept-tree ref="tree" :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick">
 
         </dept-tree>

ruoyi-ui/src/views/system/fwzljc/index.vue

@@ -4,7 +4,7 @@
       <el-form-item label="是否为重点项" prop="isZdx">
         <el-select v-model="queryParams.isZdx" placeholder="请选择是否为重点项" clearable>
           <el-option
-            v-for="dict in dict.type.CZ035"
+            v-for="dict in dict.type.XZ037"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"