liukangdong
2024-10-30 8bb0c65cdb3400d5e3cb0e174a2736c0c55995cc
Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
已修改6个文件
59 ■■■■ 文件已修改
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/HiddenDangerParamMapper.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerParam.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
@@ -39,11 +39,7 @@
     * 3、能管中心:ngzx
     */
    public interface MenuPageId{
        String afzx = "afzx";//安防中心
        String xkzx = "xkzx";//消控中心
        String ngzx = "ngzx";//能管中心
        String jsc = "jsc";//物业后勤
        String kqgzt = "attendance_workstand";//考勤管理
    }
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/HiddenDangerParamMapper.java
@@ -2,11 +2,12 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.HiddenDangerParam;
import com.github.yulichang.base.MPJBaseMapper;
/**
 * @author 江蹄蹄
 * @since 2024/04/28 16:06
 */
public interface HiddenDangerParamMapper extends BaseMapper<HiddenDangerParam> {
public interface HiddenDangerParamMapper extends MPJBaseMapper<HiddenDangerParam> {
}
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java
@@ -91,17 +91,21 @@
    private Integer checkUserId;
    @ApiModelProperty(value = "区域名称")
    @ExcelColumn(name="隐患区域",index = 1)
    @ExcelColumn(name="隐患区域",index = 2)
    private String areaName;
    @ApiModelProperty(value = "申请人姓名", example = "1")
    @TableField(exist = false)
    @ExcelColumn(name="提报人姓名",index = 3)
    @ExcelColumn(name="提报人姓名",index =4)
    private String memberName;
    @ApiModelProperty(value = "申请人所属组织名称", example = "1")
    @TableField(exist = false)
    @ExcelColumn(name="所属组织",index = 4)
    @ExcelColumn(name="所属组织",index = 5)
    private String companyName;
    @ApiModelProperty(value = "责任部门名称", example = "1")
    @TableField(exist = false)
    @ExcelColumn(name="责任部门名称",index = 1)
    private String dutyCompanyName;
    @ApiModelProperty(value = "申请人手机号", example = "1")
    @TableField(exist = false)
//    @ExcelColumn(name="申请人手机号")
@@ -120,7 +124,7 @@
    private String checkorPhone;
    @ApiModelProperty(value = "隐患类型名称", example = "1")
    @TableField(exist = false)
    @ExcelColumn(name="隐患类型",index = 2)
    @ExcelColumn(name="隐患类型",index = 3)
    private String categoryName;
    @ApiModelProperty(value = "查询开始时间(基于提报时间)", example = "2024-05-20 11:48:50")
@@ -141,12 +145,12 @@
    @ApiModelProperty(value = "提报时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ExcelColumn(name="提报时间",index = 5)
    @ExcelColumn(name="提报时间",index = 6)
    private Date submitTime;
    @ApiModelProperty(value = "处理时间(整改/退回使用)")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ExcelColumn(name="处理时间",index = 7)
    @ExcelColumn(name="处理时间",index = 8)
    private Date dealTime;
    @ApiModelProperty(value = "附件信息")
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerParam.java
@@ -83,4 +83,13 @@
    @TableField(exist = false)
    private List<Integer> memberIdList;
    @ApiModelProperty(value = "责任部门编码(关联company)", example = "1")
//    @ExcelColumn(name="提报人编码(关联member)")
    private Integer companyId;
    @ApiModelProperty(value = "责任部门编码", example = "1")
//    @ExcelColumn(name="提报人编码(关联member)")
    @TableField(exist = false)
    private Integer companyName;
}
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java
@@ -59,12 +59,16 @@
        }
        if(Constants.equalsInteger(model.getType(),Constants.ZERO)){
            //如果是区域配置
            if(model.getCompanyId() == null){
                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起,请选择责任部门!");
            }
            List<Integer> ids = model.getMemberIdList();
            if(ids==null || ids.size() ==0){
                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起,安全员信息不正确,请按要求填写内容!");
            }
           List<Member>  memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
                    .eq(Member::getType,Constants.TWO)
                    .eq(Member::getCompanyId,model.getCompanyId())
                    .in(Member::getId,ids)
                    .eq(Member::getIsdeleted,Constants.ZERO));
            if(memberList == null || memberList.size() == 0 || memberList.size() != ids.size() ){
@@ -142,12 +146,16 @@
        }
        if(Constants.equalsInteger(hiddenDangerParam.getType(),Constants.ZERO)){
            //如果是区域配置,校验安全员信息是否正确
            if(model.getCompanyId() == null){
                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起,请选择责任部门!");
            }
            List<Integer> ids =model.getMemberIdList();
            if(ids==null || ids.size() ==0){
                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起,安全员信息不正确,请按要求填写内容!");
            }
            List<Member>  memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
                    .eq(Member::getType,Constants.TWO)
                    .eq(Member::getCompanyId,model.getCompanyId())
                    .in(Member::getId,ids)
                    .eq(Member::getIsdeleted,Constants.ZERO));
            if(memberList == null || memberList.size() == 0 || memberList.size() != ids.size() ){
@@ -208,10 +216,12 @@
    @Override
    public PageData<HiddenDangerParam> findPage(PageWrap<HiddenDangerParam> pageWrap) {
        IPage<HiddenDangerParam> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        QueryWrapper<HiddenDangerParam> queryWrapper = new QueryWrapper<>();
        MPJLambdaWrapper<HiddenDangerParam> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        pageWrap.getModel().setIsdeleted(Constants.ZERO);
        queryWrapper.lambda()
        queryWrapper. selectAll(HiddenDangerParam.class)
                .selectAs(Company::getCompanyNamePath,HiddenDangerParam::getCompanyName)
                .leftJoin(Company.class,Company::getId,HiddenDangerParam::getCompanyId)
                .eq(pageWrap.getModel().getId() != null, HiddenDangerParam::getId, pageWrap.getModel().getId())
                .eq(pageWrap.getModel().getCreator() != null, HiddenDangerParam::getCreator, pageWrap.getModel().getCreator())
                .eq(pageWrap.getModel().getEditor() != null, HiddenDangerParam::getEditor, pageWrap.getModel().getEditor())
@@ -235,7 +245,7 @@
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        PageData<HiddenDangerParam> result = PageData.from(hiddenDangerParamMapper.selectPage(page, queryWrapper));
        PageData<HiddenDangerParam> result = PageData.from(hiddenDangerParamMapper.selectJoinPage(page,HiddenDangerParam.class, queryWrapper));
        return result;
    }
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
@@ -238,11 +238,13 @@
                .select("t1.phone",HiddenDanger::getMemberPhone)
                .select("t2.name",HiddenDanger::getCheckorName)
                .select("t2.phone",HiddenDanger::getCheckorPhone)
                .select("t5.company_name_path",HiddenDanger::getDutyCompanyName)
                .select("t4.company_name_path",HiddenDanger::getCompanyName);
        queryWrapper.leftJoin(Member.class,Member::getId,HiddenDanger::getMemberId)
                .leftJoin(Member.class,Member::getId,HiddenDanger::getCheckUserId)
                .leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getCateId)
                .leftJoin("company t4 on t1.company_id=t4.id");
                .leftJoin("company t4 on t1.company_id=t4.id")
                .leftJoin("company t5 on t3.company_id=t5.id");
        queryWrapper
                .eq(HiddenDanger::getId, id).last("limit 1");
@@ -318,11 +320,13 @@
                .select("t1.phone",HiddenDanger::getMemberPhone)
                .select("t2.name",HiddenDanger::getCheckorName)
                .select("t2.phone",HiddenDanger::getCheckorPhone)
                .select("t5.company_name_path",HiddenDanger::getDutyCompanyName)
                .select("t4.company_name_path",HiddenDanger::getCompanyName);
        queryWrapper.leftJoin(Member.class,Member::getId,HiddenDanger::getMemberId)
                .leftJoin(Member.class,Member::getId,HiddenDanger::getCheckUserId)
                .leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getCateId)
                .leftJoin("company t4 on t1.company_id=t4.id");
                .leftJoin("company t4 on t1.company_id=t4.id")
                .leftJoin("company t5 on t3.company_id=t5.id");
        //数据权限开始--------------------start----------------
        LoginUserInfo userInfo =pageWrap.getModel().getLoginUserInfo();
@@ -358,6 +362,7 @@
                .eq(pageWrap.getModel().getCheckUserId() != null, HiddenDanger::getCheckUserId, pageWrap.getModel().getCheckUserId())
                .eq(pageWrap.getModel().getAreaName() != null, HiddenDanger::getAreaName, pageWrap.getModel().getAreaName())
                .like(pageWrap.getModel().getCompanyName() != null,"t4.company_name_path",pageWrap.getModel().getCompanyName())
                .like(pageWrap.getModel().getDutyCompanyName() != null,"t5.company_name_path",pageWrap.getModel().getDutyCompanyName())
                .and(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()), ms->ms.like(Member::getName,pageWrap.getModel().getMemberName())
                        .or().like(Member::getPhone,pageWrap.getModel().getMemberName()))