点位校验提交(西藏)

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/SysDictitemMapper.java

@@ -29,4 +29,5 @@ public interface SysDictitemMapper {
      */
     List<String> getAllXjdwByMap(@Param("dw") Map<String, String> dw);
     String getNameBycodeXz(@Param("groupid") String groupid,@Param("code") String code);
+    String getCodeByGrade(@Param("unitcode") String unitcode, @Param("codename") String codename);
 }

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/SysDictitemMapper.xml

@@ -23,4 +23,7 @@
         from sys_dictitem_xz
         where ${dw.codeLevCol} = #{dw.unitcode}
     </select>
+    <select id="getCodeByGrade" resultType="java.lang.String">
+        select ${codename} from sys_dictitem_xz where CODE = #{unitcode}
+    </select>
 </mapper>
\ No newline at end of file

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/TbStAsjMapper.xml

@@ -333,11 +333,9 @@
             SFJY_PDBZ='2',
             JY_JD=NULL,
             JY_WD=NULL,
-            AJ_JD=NULL,
-            AJ_WD=NULL,
         </if>
         <if test="gxrDwdm!=null and gxrDwdm!=''">gxr_dwdm = #{gxrDwdm, jdbcType=VARCHAR},</if>
-        <if test="gxrDwmc!=null and gxrDwmc!=''">gxr_dwmc  = #{gxrDwmc, jdbcType=VARCHAR},</if>
+        <if test="gxrDwmc!=null and gxrDwmc!=''">gxr_dwmc = #{gxrDwmc, jdbcType=VARCHAR},</if>
         <if test="gxrXm!=null and gxrXm!=''">gxr_xm = #{gxrXm, jdbcType=VARCHAR},</if>
         <if test="gxrZjhm!=null and gxrZjhm!=''">gxr_zjhm = #{gxrZjhm, jdbcType=VARCHAR},</if>
         gxsj=sysdate()

service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/TbStAsjServiceImpl.java

@@ -249,25 +249,25 @@ public class TbStAsjServiceImpl extends ServiceImpl<TbStAsjMapper, TbStAsj> impl
 
     public TbAsjJwdinfo getTbAsjJwdinfo(TbAsjJwdinfo tbAsjJwdinfo, SysUser user){
         if(null!=user){
-            if(!"1".equals(sysDictitemMapper.getDwLevByDwdm(user.getUnitcode()))){// 省级用户不用取拿下级单位 查询所有
+            if(!"S".equals(user.getGrade())){// 省级用户不用取拿下级单位 查询所有
                 // 拿到当前登陆者本级以及下级单位
-                tbAsjJwdinfo.setUnitcodeList(dwList(user.getUnitcode()));
-            }
+                tbAsjJwdinfo.setUnitcodeList(dwList(user.getUnitcode(),user.getGrade()));
+            };
         }
 
         // 受理单位
         if (StringUtils.isNotEmpty(tbAsjJwdinfo.getSldwGajgjgdm())) {
-            tbAsjJwdinfo.setSldwGajgjgdmList(dwList(tbAsjJwdinfo.getSldwGajgjgdm()));
+            tbAsjJwdinfo.setSldwGajgjgdmList(dwList(tbAsjJwdinfo.getSldwGajgjgdm(),user.getGrade()));
         }
 
         // 立案单位
         if (StringUtils.isNotEmpty(tbAsjJwdinfo.getLadwGajgjgdm())) {
-            tbAsjJwdinfo.setLadwGajgjgdmList(dwList(tbAsjJwdinfo.getLadwGajgjgdm()));
+            tbAsjJwdinfo.setLadwGajgjgdmList(dwList(tbAsjJwdinfo.getLadwGajgjgdm(),user.getGrade()));
         }
 
         // 现勘单位
         if (StringUtils.isNotEmpty(tbAsjJwdinfo.getXkdwGajgjgdm())) {
-            tbAsjJwdinfo.setXkdwGajgjgdmList(dwList(tbAsjJwdinfo.getXkdwGajgjgdm()));
+            tbAsjJwdinfo.setXkdwGajgjgdmList(dwList(tbAsjJwdinfo.getXkdwGajgjgdm(),user.getGrade()));
         }
 
         // 案件类别代码模糊查询
@@ -300,7 +300,9 @@ public class TbStAsjServiceImpl extends ServiceImpl<TbStAsjMapper, TbStAsj> impl
         return tbAsjJwdinfo;
     }
 
-    public List<String> dwList(String unitcode){
+    public List<String> dwList(String unitcode,String grade){
+        // 根据用户等级处理单位
+        unitcode = getUnitCodeByGrade(unitcode,grade);
         // 拿到当前登陆者本级以及下级单位
         String lev = sysDictitemMapper.getDwLevByDwdm(unitcode);
         List<String> dwList = new ArrayList<>();
@@ -320,8 +322,23 @@ public class TbStAsjServiceImpl extends ServiceImpl<TbStAsjMapper, TbStAsj> impl
         return dwList;
     }
 
+    public String getUnitCodeByGrade(String unitCode,String grade){
+        // 根据用户等级处理单位
+        if ("S".equalsIgnoreCase(grade)){
+            unitCode = "540000000000";
+        }else if ("D".equalsIgnoreCase(grade)){
+            unitCode = sysDictitemMapper.getCodeByGrade(unitCode,"CODE_LEV2");
+        }else if ("X".equalsIgnoreCase(grade)){
+            unitCode = sysDictitemMapper.getCodeByGrade(unitCode,"CODE_LEV3");
+        }
+        return unitCode;
+    }
+
     private TbAsjJwdinfo setTjDwxx(TbAsjJwdinfo tbAsjJwdinfo, SysUser user){
         String unitcode = user.getUnitcode();
+        String grade = user.getGrade();
+        // 根据用户等级处理单位
+        unitcode = getUnitCodeByGrade(unitcode,grade);
         String lev = sysDictitemMapper.getDwLevByDwdm(unitcode);
         Map<String, String> levMap = DwUtilCommon.getMapDwLevCode(unitcode, lev);
         tbAsjJwdinfo.setCodeLevCol(levMap.get("codeLevCol"));