问题修改

ZQN

2024-06-24 b003b843a47f87bc47f870274d5d012d5208f00b

问题修改

 project-enforce/src/main/java/com/project/enforce/domain/EnforceComplaintLog.java

@@ -81,6 +81,9 @@
    @ApiModelProperty("投诉类型")
    private String complaintType;

    @ApiModelProperty("执法时间")
    private Date executeTime;

    @ApiModelProperty("投诉时间")
    private Date complaintTime;


 project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceComplaintLogBo.java

@@ -73,6 +73,9 @@
    @ApiModelProperty("投诉类型")
    private String complaintType;

    @ApiModelProperty("执法时间")
    private Date executeTime;

    @ApiModelProperty("投诉时间")
    private Date complaintTime;


 project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceComplaintLogQueryBo.java

@@ -74,6 +74,9 @@
    @ApiModelProperty("投诉类型")
    private String complaintType;

    @ApiModelProperty("执法时间")
    private Date executeTime;

    @ApiModelProperty("投诉时间")
    private Date complaintTime;


 project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceComplaintLogVo.java

@@ -64,6 +64,11 @@
    @ApiModelProperty("投诉类型")
    private String complaintType;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty("执法时间")
    private Date executeTime;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty("投诉时间")
    private Date complaintTime;

 project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java

@@ -140,25 +140,26 @@
        if (StringUtils.isEmpty(entity.getExecuteDeptName()) && entity.getExecuteDeptName()!=null){
            entity.setExecuteDeptName(deptService.getDeptAllName(entity.getExecuteDeptId()));
        }
        if (entity.getCompanyId()==null
                || StringUtils.isEmpty(entity.getCompanyName())
                || StringUtils.isEmpty(entity.getCompanyUser())
                || StringUtils.isEmpty(entity.getCompanyPhone())
        ){
            throw new BaseException("投诉企业不能为空！");
        }
        if (entity.getExecuteDeptId() == null
                || StringUtils.isEmpty(entity.getExecuteDeptName())
        ){
            throw new BaseException("投诉单位不能为空！");
        }
        if (StringUtils.isEmpty(entity.getComplaintType())){
            throw new BaseException("请选择要投诉类型！");
        }
        if (StringUtils.isEmpty(entity.getComplaintReason())){
            throw new BaseException("请填写投诉内容！");
        }
        if (entity.getId()==null){
            if (entity.getCompanyId()==null
                    || StringUtils.isEmpty(entity.getCompanyName())
                    || StringUtils.isEmpty(entity.getCompanyUser())
                    || StringUtils.isEmpty(entity.getCompanyPhone())
            ){
                throw new BaseException("投诉企业不能为空！");
            }
            if (entity.getExecuteDeptId() == null
                    || StringUtils.isEmpty(entity.getExecuteDeptName())
            ){
                throw new BaseException("投诉单位不能为空！");
            }
            if (StringUtils.isEmpty(entity.getComplaintType())){
                throw new BaseException("请选择要投诉类型！");
            }
            if (StringUtils.isEmpty(entity.getComplaintReason())){
                throw new BaseException("请填写投诉内容！");
            }

            if (entity.getOrderId()!=null){ //执法单投诉
                int count = this.count(lq().eq(EnforceComplaintLog::getOrderId, entity.getOrderId()));
                if (count >0){

 project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java

@@ -312,7 +312,7 @@
        SysUser user = SecurityUtils.getLoginUser().getUser();
        order.setExecuteId(user.getUserId());
        order.setExecuteUser(user.getNickName());
        order.setExecutePhone(user.getRecommendPhone());
        order.setExecutePhone(user.getPhonenumber());
        order.setExecuteDeptId(user.getDeptId());
        order.setExecuteDeptName(deptService.getDeptAllName(user.getDeptId()));
        order.setInTime(DateUtils.getNowDate());