标牌bug

shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java

@@ -22,6 +22,7 @@ import com.shuili.common.core.controller.BaseController;
 import com.shuili.common.core.domain.SearchParam;
 import com.shuili.common.core.domain.entity.SysDept;
 import com.shuili.common.core.domain.entity.SysUser;
+import com.shuili.common.utils.StringUtils;
 import com.shuili.common.utils.poi.ExcelUtil;
 import com.kms.common.utils.BaseEntityUtils;
 
@@ -118,11 +119,13 @@ public class BsSgcDfSafeJbxxController extends BaseController {
         String[] roleIds = sysUser.getRoleIds();
         SysDept dept = sysUser.getDept();
         String xzqhId = dept.getXzqhId();
-
+        if(StringUtils.isNotEmpty(sp.getData().getAdcd())){
+            xzqhId=sp.getData().getAdcd();
+        }
         String name = dept.getName();
         boolean isGLDW=false;
         for (String roleId:roleIds){
-            if (roleId.equals("Yw00352")){
+            if (roleId.equals("YW00352")){
                 isGLDW=true;
                 break;
             }
@@ -135,6 +138,7 @@ public class BsSgcDfSafeJbxxController extends BaseController {
                             .eq(BsSgcDfSafeJbxx::getMnun,name)
                             .eq(data.getDikeType() != null, BsSgcDfSafeJbxx::getDikeType, data.getDikeType())
                             .eq(data.getStatus() != null, BsSgcDfSafeJbxx::getStatus, data.getStatus())
+                            .likeRight(xzqhId!=null,BsSgcDfSafeJbxx::getAdcd,sysXzqhService.getSubString(xzqhId))
                             .isNull(BsSgcDfSafeJbxx::getExprDate)
                             .orderByAsc(BsSgcDfSafeJbxx::getDikeGrad)
                             .orderByDesc(BsSgcDfSafeJbxx::getCreateTime));
@@ -145,7 +149,7 @@ public class BsSgcDfSafeJbxxController extends BaseController {
                         .eq(data.getDikeType() != null, BsSgcDfSafeJbxx::getDikeType, data.getDikeType())
                         .eq(data.getStatus() != null, BsSgcDfSafeJbxx::getStatus, data.getStatus())
                         .isNull(BsSgcDfSafeJbxx::getExprDate)
-                        .likeRight(data.getAdcd() != null, BsSgcDfSafeJbxx::getAdcd, sysXzqhService.getSubString(data.getAdcd()))
+                        .likeRight(data.getAdcd() != null, BsSgcDfSafeJbxx::getAdcd, sysXzqhService.getSubString(xzqhId))
                         .orderByAsc(BsSgcDfSafeJbxx::getDikeGrad)
                         .orderByDesc(BsSgcDfSafeJbxx::getCreateTime));
         }

shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzbpController.java

@@ -5,12 +5,15 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.kms.common.utils.UserUtils;
 import com.kms.system.domain.SysXzqh;
 import com.kms.system.service.SysDeptService;
 import com.kms.system.service.SysXzqhService;
 import com.kms.yg.df.domain.BsSgcDfBzbp;
+import com.kms.yg.sz.domain.BsSgcSzSafeJbxx;
+import com.kms.yg.sz.service.BsSgcSzSafeJbxxService;
 import com.shuili.common.core.controller.BaseController;
 import com.shuili.common.core.domain.SearchParam;
 import com.shuili.common.core.domain.entity.SysDept;
@@ -96,10 +99,8 @@ public class BsSgcSzBzbpController extends BaseController
 
         }else if (adcd == null) {
             SysUser user = UserUtils.getUser();
-            String deptId = user.getDeptId();
-            SysDept sysDept = sysDeptService.get(deptId);
-            String xzqhId = sysDept.getXzqhId();
-            SysXzqh xzqh = sysXzqhService.getById(xzqhId);
+            SysDept dept = user.getDept();
+            SysXzqh xzqh = sysXzqhService.getById(dept.getXzqhId().substring(0,6));
             String substring = "";
             if (xzqh.getLayer()==1) {
                 substring = xzqh.getXzqhdm().substring(0, 2);
@@ -162,20 +163,30 @@ public class BsSgcSzBzbpController extends BaseController
     /**
      * 新增水闸标识标牌
      */
+    @Autowired
+    private BsSgcSzSafeJbxxService bsSgcSzSafeJbxxService;
+
     @Log(title = "水闸标识标牌新增", businessType = BusinessType.INSERT)
     @PostMapping
     @ApiOperation("水闸标识标牌新增")
     public AjaxResult add(@RequestBody List<BsSgcSzBzbp> list)
     {
+        String adcd=null;
+        BsSgcSzBzbp bsSgcSzBzbpOne = list.get(0);
+        String wagaCode = bsSgcSzBzbpOne.getWagaCode();
+        LambdaQueryWrapper<BsSgcSzSafeJbxx>lw=new LambdaQueryWrapper<>();
+        BsSgcSzSafeJbxx one = bsSgcSzSafeJbxxService.getOne(lw.eq(BsSgcSzSafeJbxx::getWagaCode, wagaCode));
+        adcd=one.getAdcd();
+
         for (BsSgcSzBzbp bsSgcSzBzbp : list) {
             BaseEntityUtils.preInsert(bsSgcSzBzbp);
             bsSgcSzBzbp.setSortTime(new Date());
-            String adcd = bsSgcSzBzbp.getAdcd();
             if (adcd == null) {
                 SysUser user = UserUtils.getUser();
-                String deptId = user.getDeptId();
-                SysDept sysDept = sysDeptService.get(deptId);
-                bsSgcSzBzbp.setAdcd(sysDept.getXzqhName());
+                SysDept dept = user.getDept();
+                bsSgcSzBzbp.setAdcd(dept.getXzqhId());
+            }else {
+                bsSgcSzBzbp.setAdcd(adcd);
             }
             bsSgcSzBzbpService.save(bsSgcSzBzbp);
         }

shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java

@@ -20,6 +20,7 @@ import com.shuili.common.core.controller.BaseController;
 import com.shuili.common.core.domain.SearchParam;
 import com.shuili.common.core.domain.entity.SysDept;
 import com.shuili.common.core.domain.entity.SysUser;
+import com.shuili.common.utils.StringUtils;
 import com.shuili.common.utils.poi.ExcelUtil;
 import com.kms.common.utils.BaseEntityUtils;
 
@@ -116,11 +117,13 @@ public class BsSgcSzSafeJbxxController extends BaseController {
         String[] roleIds = sysUser.getRoleIds();
         SysDept dept = sysUser.getDept();
         String xzqhId = dept.getXzqhId();
-
+        if(StringUtils.isNotEmpty(sp.getData().getAdcd())){
+            xzqhId=sp.getData().getAdcd();
+        }
         String name = dept.getName();
         boolean isGLDW=false;
         for (String roleId:roleIds){
-            if (roleId.equals("Yw00352")){
+            if (roleId.equals("YW00352")){
                 isGLDW=true;
                 break;
             }
@@ -133,6 +136,7 @@ public class BsSgcSzSafeJbxxController extends BaseController {
                             .eq(BsSgcSzSafeJbxx::getMnun,name)
                             .eq(data.getWagaType() != null, BsSgcSzSafeJbxx::getWagaType, data.getWagaType())
                             .eq(data.getStatus() != null, BsSgcSzSafeJbxx::getStatus, data.getStatus())
+                            .likeRight(xzqhId!=null,BsSgcSzSafeJbxx::getAdcd,sysXzqhService.getSubString(xzqhId))
                             .isNull(BsSgcSzSafeJbxx::getExprDate)
                             .orderByAsc(BsSgcSzSafeJbxx::getEngScal));
         }else {
@@ -141,7 +145,7 @@ public class BsSgcSzSafeJbxxController extends BaseController {
                             .ne(BsSgcSzSafeJbxx::getStatus, "0")
                             .eq(data.getWagaType() != null, BsSgcSzSafeJbxx::getWagaType, data.getWagaType())
                             .eq(data.getStatus() != null, BsSgcSzSafeJbxx::getStatus, data.getStatus())
-                            .likeRight(data.getAdcd() != null, BsSgcSzSafeJbxx::getAdcd, sysXzqhService.getSubString(data.getAdcd()))
+                            .likeRight(xzqhId != null, BsSgcSzSafeJbxx::getAdcd, sysXzqhService.getSubString(xzqhId))
                             .isNull(BsSgcSzSafeJbxx::getExprDate)
 //                        .orderByDesc(BsSgcSzSafeJbxx::getCreateTime)
                             .orderByAsc(BsSgcSzSafeJbxx::getEngScal));