审核bug修复

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZHouseController.java

@@ -124,11 +124,23 @@ public class ZHouseController extends BaseController {
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable String[] ids) {
         //是否需要校验
-        int i = civilService.getCivilByhouseId(Arrays.asList(ids));
-        if (i>0) {
-            return R.fail("房间已关联民用工程不能删除!");
-        }
+//        int i = civilService.getCivilByhouseId(Arrays.asList(ids));
+//        if (i>0) {
+//            return R.fail("房间已关联民用工程不能删除!");
+//        }
         return toAjax(iZHouseService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
+//    @SaCheckPermission("zdsz:house:remove")
+//    @Log(title = "房间信息", businessType = BusinessType.Q)
+    @GetMapping("/getHousesMessage")
+    public R getHousesMessage(@RequestBody ZHouseBo zHouseBo) {
+        //是否需要校验
+//        int i = civilService.getCivilByhouseId(Arrays.asList(ids));
+//        if (i>0) {
+//            return R.fail("房间已关联民用工程不能删除!");
+//        }
+        return R.ok(iZHouseService.getHousesMessage(zHouseBo));
+    }
+
 
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZHouse.java

@@ -67,4 +67,5 @@ public class ZHouse extends BaseEntity {
     @TableLogic
     private String delFlag;
 
+
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/mapper/ZEngineeringCivilMapper.java

@@ -31,5 +31,6 @@ public interface ZEngineeringCivilMapper extends BaseMapperPlus<ZEngineeringCivi
     areaMessageVo getHouseMessage(String Id);
     areaMessageVo getAreaMessage(String Id);
     areaMessageVo getAreaName(String Id);
+    List<String> getTableNames(String tableName);
 
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZHouseService.java

@@ -50,5 +50,12 @@ public interface IZHouseService {
     int getHouseByUnitId(Collection<String> list);
 
     List<ZHouseVo> getHouses(String unitId);
+
+    /**
+     * 获取房间信息
+     * @param zHouseBo
+     * @return
+     */
+    ZHouse getHousesMessage( ZHouseBo zHouseBo);
     ZHouseVo getHousesByIdCard(String idCard);
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringCivilServiceImpl.java

@@ -203,6 +203,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
                 item.setNodeReViewStateList(ReviewList.get(item.getId()));
         });
         page.setTotal(!ObjectUtils.isEmpty(result.getRecords()) ? result.getRecords().get(0).getTotal() : 0);
+        //zEngineeringCivilList("1","2");
         return TableDataInfo.build(result);
     }
 
@@ -230,6 +231,10 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         lqw.eq(StringUtils.isNotBlank(bo.getImgUrl()), ZEngineeringCivil::getImgUrl, bo.getImgUrl());
         return lqw;
     }
+    private List<String> zEngineeringCivilList(String createTime,String UserName){
+
+        return baseMapper.getTableNames("z_engineering_info");
+    };
 
     @Autowired
     private ZEngineeringNodeServiceImpl zEngineeringNodeService;

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringNodeServiceImpl.java

@@ -8,6 +8,7 @@ import com.ruoyi.common.annotation.DynamicName;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.UserType;
 import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.redis.RedisUtils;
@@ -83,7 +84,9 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
         LambdaQueryWrapper<ZEngineeringNode> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getCivliId()), ZEngineeringNode::getCivliId, bo.getCivliId());
         lqw.eq(StringUtils.isNotBlank(bo.getType()), ZEngineeringNode::getType, bo.getType());
-        if (!LoginHelper.isAdmin())
+        System.out.println(LoginHelper.getUserType());
+        System.out.println(UserType.SYS_USER);
+        if (!LoginHelper.getUserType().equals(UserType.SYS_USER))
             lqw.eq(ZEngineeringNode::getCreateBy, LoginHelper.getLoginUser().getUsername());
         ZEngineeringNode zEngineeringNode = baseMapper.selectOne(lqw);
         //        ZEngineeringNode zEngineeringNodeVo=baseMapper.selectById(bo.getId());

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringReviewServiceImpl.java

@@ -155,14 +155,14 @@ public class ZEngineeringReviewServiceImpl implements IZEngineeringReviewService
        zEngineeringReview.setReviewUser(LoginHelper.getLoginUser().getUserId().toString());
        zEngineeringReview.setReviewTime(new Date());
         zEngineeringReview.setUpdateTime(new Date());
-        LambdaQueryWrapper<ZEngineeringReview> lqw = Wrappers.lambdaQuery();
-        lqw.eq(StringUtils.isNotBlank(bo.getEngInfoId()), ZEngineeringReview::getEngInfoId, bo.getEngInfoId());
-        lqw.eq(ZEngineeringReview::getReviewStatus, '1');
+//        LambdaQueryWrapper<ZEngineeringReview> lqw = Wrappers.lambdaQuery();
+//        lqw.eq(StringUtils.isNotBlank(bo.getEngInfoId()), ZEngineeringReview::getEngInfoId, bo.getEngInfoId());
+//        lqw.eq(ZEngineeringReview::getReviewStatus, '1');
         boolean flag =false;
-        if (!baseMapper.exists(lqw))
-        {
+//        if (!baseMapper.exists(lqw))
+//        {
             flag=  baseMapper.insert(zEngineeringReview)> 0;
-        }
+//        }
         MonthTableNameHandler.setData(new SimpleDateFormat("yyyy_MM").format(bo.getCreateTime()));
         updateCivilStatus(zEngineeringCivil);
         MonthTableNameHandler.removeData();

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZHouseServiceImpl.java

@@ -105,6 +105,7 @@ public class ZHouseServiceImpl implements IZHouseService {
         return baseMapper.updateById(update) > 0;
     }
 
+
     /**
      * 保存前的数据校验
      */
@@ -140,4 +141,12 @@ public class ZHouseServiceImpl implements IZHouseService {
     public ZHouseVo getHousesByIdCard(String idCard) {
         return baseMapper.getHousesByIdCard(idCard);
     }
+
+    @Override
+    public ZHouse getHousesMessage(ZHouseBo zHouseBo) {
+        LambdaQueryWrapper<ZHouse> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(zHouseBo.getId()), ZHouse::getId,zHouseBo.getId());
+        lqw.eq(StringUtils.isNotBlank(zHouseBo.getIdCard()), ZHouse::getIdCard, zHouseBo.getBuildingId());
+        return baseMapper.selectOne(lqw);
+    }
 }

ruoyi-zdsz/src/main/resources/mapper/zdsz/ZHouseMapper.xml

@@ -37,8 +37,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         (select d.name from z_unit d where d.id = a.unit_id) as unitName,
         a.house_user_name as houseUserName,
         a.id_card as idCard,
-        a.photo,
-        a.new_photo as newPhoto
+        a.phone,
+        a.new_phone as newPhone
         from z_house a
         <where>
             a.del_flag = '0'
@@ -60,11 +60,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="p.idCard != null  and p.idCard != ''">
                 and a.id_card LIKE CONCAT('%',#{p.idCard},'%')
             </if>
-            <if test="p.photo != null  and p.photo != ''">
-                and a.photo LIKE CONCAT('%',#{p.photo},'%')
+            <if test="p.phone != null  and p.phone != ''">
+                and a.phone LIKE CONCAT('%',#{p.phone},'%')
             </if>
-            <if test="p.newPhoto != null  and p.newPhoto != ''">
-                and a.new_photo LIKE CONCAT('%',#{p.newPhoto},'%')
+            <if test="p.newPhone != null  and p.newPhone != ''">
+                and a.new_phone LIKE CONCAT('%',#{p.newPhone},'%')
             </if>
         </where>
         order by a.name asc