Merge remote-tracking branch 'origin/master'

xiangpei

2024-04-10 e7e9f6b33432d8a312a6b8cf0164fa095492d0fa

Merge remote-tracking branch 'origin/master'

 document/×Ô¹±ÏîÄ¿ÈÎÎñ·ÖÅä.xlsx

 document/ÐèÇóÈ·ÈÏÊé.docx

Binary files differ

 ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateRecord.java

@@ -3,6 +3,7 @@
import annotation.Excel;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.system.entity.BaseEntity;
import lombok.Data;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;

@@ -15,6 +16,7 @@
 * @author ruoyi
 * @date 2024-04-03
 */
@Data
public class CalculateRecord extends BaseEntity
{
    private static final long serialVersionUID = 1L;
@@ -37,7 +39,7 @@

    /** æ€»æœåŠ¡è´¹ */
    @Excel(name = "总服务费")
    private BigDecimal totalMount;
    private BigDecimal totalAmount;

    /** æ‰£å‡æœåŠ¡è´¹ */
    @Excel(name = "扣减服务费")
@@ -47,80 +49,5 @@
    @Excel(name = "考核分数")
    private BigDecimal score;

    public void setId(Long id) 
    {
        this.id = id;
    }

    public Long getId() 
    {
        return id;
    }
    public void setDate(Date date) 
    {
        this.date = date;
    }

    public Date getDate() 
    {
        return date;
    }
    public void setRuleId(Long ruleId) 
    {
        this.ruleId = ruleId;
    }

    public Long getRuleId() 
    {
        return ruleId;
    }
    public void setUnitId(Long unitId) 
    {
        this.unitId = unitId;
    }

    public Long getUnitId() 
    {
        return unitId;
    }
    public void setTotalMount(BigDecimal totalMount) 
    {
        this.totalMount = totalMount;
    }

    public BigDecimal getTotalMount() 
    {
        return totalMount;
    }
    public void setDeductAmount(BigDecimal deductAmount) 
    {
        this.deductAmount = deductAmount;
    }

    public BigDecimal getDeductAmount() 
    {
        return deductAmount;
    }
    public void setScore(BigDecimal score) 
    {
        this.score = score;
    }

    public BigDecimal getScore() 
    {
        return score;
    }

    @Override
    public String toString() {
        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
            .append("id", getId())
            .append("date", getDate())
            .append("ruleId", getRuleId())
            .append("unitId", getUnitId())
            .append("totalMount", getTotalMount())
            .append("deductAmount", getDeductAmount())
            .append("score", getScore())
            .toString();
    }
}

 ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckRule.java

@@ -24,7 +24,7 @@

    /** è§„则细则 */
    @Excel(name = "规则细则")
    private String ruleDetail;
    private String ruleIndex;

    /** è§„则类型 */
    @Excel(name = "规则类型")
@@ -37,10 +37,6 @@
    /** è§„则描述 */
    @Excel(name = "规则描述")
    private String ruleDescription;

    /** å®¡æ ¸çŠ¶æ€ */
    @Excel(name = "审核状态")
    private Long auditState;

    /** å¯ç”¨çŠ¶æ€ */
    @Excel(name = "启用状态")
@@ -67,14 +63,14 @@
    {
        return ruleName;
    }
    public void setRuleDetail(String ruleDetail) 
    public void setRuleIndex(String ruleIndex)
    {
        this.ruleDetail = ruleDetail;
        this.ruleIndex = ruleIndex;
    }

    public String getRuleDetail() 
    public String getRuleIndex()
    {
        return ruleDetail;
        return ruleIndex;
    }
    public void setRuleCategory(Long ruleCategory) 
    {
@@ -103,15 +99,7 @@
    {
        return ruleDescription;
    }
    public void setAuditState(Long auditState) 
    {
        this.auditState = auditState;
    }

    public Long getAuditState() 
    {
        return auditState;
    }
    public void setState(Long state) 
    {
        this.state = state;
@@ -136,11 +124,10 @@
        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
            .append("id", getId())
            .append("ruleName", getRuleName())
            .append("ruleDetail", getRuleDetail())
            .append("ruleIndex", getRuleIndex())
            .append("ruleCategory", getRuleCategory())
            .append("examineCategory", getExamineCategory())
            .append("ruleDescription", getRuleDescription())
            .append("auditState", getAuditState())
            .append("state", getState())
            .append("createTime", getCreateTime())
            .append("updateTime", getUpdateTime())

 ycl-pojo/src/main/java/com/ycl/platform/domain/entity/Report.java

@@ -2,14 +2,13 @@

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import java.time.LocalDateTime;
import java.util.Date;

import com.ycl.platform.base.AbsEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;

import java.util.Date;

/**
 * æŠ¥å¤‡
@@ -56,6 +55,14 @@
    @TableField("error_type")
    private String errorType;

    @ApiModelProperty("状态")
    @TableField("status")
    private Integer status;

    @ApiModelProperty("审核意见")
    @TableField("audit_opinion")
    private String auditOpinion;

    @ApiModelProperty("生效时间")
    @TableField("begin_create_time")
    private Date beginCreateTime;

 ycl-pojo/src/main/java/com/ycl/platform/domain/form/ReportForm.java

@@ -58,6 +58,12 @@
    @ApiModelProperty("故障类型")
    private String errorType;

    @ApiModelProperty("审核意见")
    private String auditOpinion;

    @ApiModelProperty("状态")
    private Integer status;

    public static Report getEntityByForm(@NonNull ReportForm form, Report entity) {
        if(entity == null) {
          entity = new Report();

 ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderForm.java

@@ -26,7 +26,7 @@
@ApiModel(value = "WorkOrder表单", description = "工单表单")
public class WorkOrderForm extends AbsForm {

    @NotBlank(message = "工单号不能为空", groups = {Add.class, Update.class})
    // @NotBlank(message = "工单号不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("工单号")
    private String workOrderNo;

@@ -34,23 +34,31 @@
    @ApiModelProperty("运维单位")
    private Integer unitId;

    @NotNull(message = "运维人员不能为空", groups = {Add.class, Update.class})
    @NotBlank(message = "工单来源不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("工单来源")
    private String source;

    @NotNull(message = "故障类型不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("故障类型")
    private String errorType;

    // @NotNull(message = "运维人员不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("运维人员")
    private Integer ywPeopleId;

    @NotNull(message = "运维处理时间不能为空", groups = {Add.class, Update.class})
    // @NotNull(message = "运维处理时间不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("运维处理时间")
    private LocalDateTime ywHandleTime;

    @NotBlank(message = "运维结果不能为空", groups = {Add.class, Update.class})
    // @NotBlank(message = "运维结果不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("运维结果")
    private String ywResult;

    @NotBlank(message = "运维情况不能为空", groups = {Add.class, Update.class})
    // @NotBlank(message = "运维情况不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("运维情况")
    private String ywCondition;

    @NotBlank(message = "运维检测结果不能为空", groups = {Add.class, Update.class})
    // @NotBlank(message = "运维检测结果不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("运维检测结果")
    private String ywCheckResult;


 ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckRuleQuery.java

New file
@@ -0,0 +1,39 @@
package com.ycl.platform.domain.query;

import annotation.Excel;
import com.ycl.platform.base.AbsQuery;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.experimental.Accessors;

/**
 * ä¸‹å‘工单查询
 *
 */
@Data
@Accessors(chain = true)
@ApiModel(value = "考核规则管理", description = "考核规则管理")
public class CheckRuleQuery extends AbsQuery {
    /**
     * æ¨¡æ¿id
     */
    private Integer templateId;
    /**
     * å®¡æ ¸çŠ¶æ€
     */
    private Integer auditState;
    /**
     * è§„则名称
     */
    private String ruleName;
    /**
     * è§„则类型
     */
    private Integer ruleCategory;
    /**
     * è€ƒæ ¸ç±»åž‹
     */
    private Integer examineCategory;


}

 ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckTemplateQuery.java

New file
@@ -0,0 +1,79 @@
package com.ycl.platform.domain.query;

import annotation.Excel;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.base.AbsQuery;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.experimental.Accessors;

import java.util.Date;
import java.util.List;

@Data
@Accessors(chain = true)
@ApiModel(value = "规则模板查询", description = "规则模板查询")
public class CheckTemplateQuery extends AbsQuery {
    /**  */
    private Long id;

    /** æ¨¡æ¿åç§° */
    @Excel(name = "模板名称")
    private String templateName;

    /** è°ƒæ•´ç³»æ•° */
    @Excel(name = "调整系数")
    private Long adjustCoefficient;

    /** è°ƒæ•´æ–¹å¼ï¼šä¹˜é™¤ */
    @Excel(name = "调整方式：乘除")
    private String adjustWay;

    /** è€ƒæ ¸ç±»åž‹ */
    @Excel(name = "考核类型")
    private Long examineCategory;

    /** å¯ç”¨/停用 */
    @Excel(name = "启用/停用")
    private String status;

    /** åŒºåŽ¿ */
    @Excel(name = "区县")
    private List deptId;

    /** åˆ›å»ºäººid */
    private Long createUser;

    /** åˆ›å»ºäººå§“名 */
    @Excel(name = "创建人姓名")
    private String createUserName;

    /**  */
    private Long updateUser;

    /**  */
    @Excel(name = "")
    private String updateUserName;

    /** é€»è¾‘删除 */
    private String deleted;


    /** åˆ›å»ºè€… */
    private String createBy;

    /** åˆ›å»ºæ—¶é—´ */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;

    /** æ›´æ–°è€… */
    @TableField(fill = FieldFill.UPDATE)
    private String updateBy;

    /** æ›´æ–°æ—¶é—´ */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @TableField(fill = FieldFill.UPDATE)
    private Date updateTime;
}

 ycl-pojo/src/main/java/com/ycl/platform/domain/query/ReportQuery.java

@@ -28,5 +28,13 @@

    private Date endCreateTime;

    private String pointId;

    private String peopleId;

    private List<Integer> pointIdList;

    private List<Integer> peopleIdList;

}


 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckRuleVO.java

New file
@@ -0,0 +1,55 @@
package com.ycl.platform.domain.vo;

import annotation.Excel;
import com.ycl.platform.base.AbsVo;
import lombok.Data;
import lombok.experimental.Accessors;

import java.math.BigDecimal;

/**
 * è€ƒæ ¸è§„则展示
 *
 */
@Data
@Accessors(chain = true)
public class CheckRuleVO extends AbsVo {
    /**
     * æ¨¡æ¿id
     */
    private Integer templateId;

    /** æ¨¡æ¿å */
    private String templateName;
    /**
     * å®¡æ ¸çŠ¶æ€
     */
    private Integer auditState;
    /**
     * è§„则名称
     */
    private String ruleName;
    /**
     * è§„则类型
     */
    private String ruleCategory;

    /** è§„则细则 */
    private String ruleIndex;

    /** è€ƒæ ¸ç±»åž‹ */
    private Long examineCategory;

    /** è§„则描述 */
    private String ruleDescription;

    /** è§„则权重 */
    private BigDecimal weight;

    /** å¯ç”¨çŠ¶æ€ */
    private Long state;

    /** é€»è¾‘删除 */
    private String deleted;

}

 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ReportVO.java

@@ -1,5 +1,6 @@
package com.ycl.platform.domain.vo;

import annotation.Excel;
import com.ycl.platform.base.AbsVo;
import com.ycl.platform.domain.entity.Report;

@@ -25,30 +26,38 @@

    /** è¿ç»´å•ä½ID */
    private Integer unitId;
    @Excel(name = "运维单位")
    private String unitName;

    /** è¿ç»´äººå‘˜ID */
    private Integer peopleId;
    @Excel(name = "报备人员")
    private String peopleName;

    /** ç‚¹ä½ID */
    private Integer pointId;
    @Excel(name = "点位")
    private String pointName;

    /** æŠ¥å¤‡ç±»åž‹ */
    @Excel(name = "报备类型")
    private String reportType;

    /** å®¡æ ¸æ—¶é—´ */
    private LocalDateTime auditingTime;

    /** æŠ¥å¤‡å†…容 */
    @Excel(name = "报备内容")
    private String reportContent;

    /** ä¸ŠæŠ¥ææ–™ */
    @Excel(name = "上报材料")
    private String reportMaterials;

    /** æ•…障类型 */
    @Excel(name = "故障类型")
    private String errorType;

    /** å®¡æ ¸æ—¶é—´ */
    @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
    private Date auditingTime;

    /**
     * ç”Ÿæ•ˆæ—¶é—´
@@ -60,6 +69,11 @@
     */
    private Date endCreateTime;

    /**
     * è£…å¡«
     */
    private Integer status;

    public static ReportVO getVoByEntity(@NonNull Report entity, ReportVO vo) {
        if(vo == null) {
            vo = new ReportVO();

 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwUnitVO.java

@@ -1,5 +1,6 @@
package com.ycl.platform.domain.vo;

import annotation.Excel;
import com.ycl.platform.base.AbsVo;

import com.ycl.platform.domain.entity.YwUnit;
@@ -18,22 +19,22 @@
@Accessors(chain = true)
public class YwUnitVO extends AbsVo {

    /** å•ä½ç¼–码 */
    @Excel(name = "单位编码")
    private String unitCode;

    /** å•ä½åç§° */
    @Excel(name = "单位名称")
    private String unitName;

    /** å•ä½è”系人 */
    @Excel(name = "单位联系人")
    private String unitContact;

    /** å•ä½è”系人电话 */
    @Excel(name = "单位联系人电话")
    private String unitContactPhone;

    /** å•ä½ç®¡ç†å‘˜è´¦å· */
    @Excel(name = "单位管理员账号")
    private String unitAdminAccount;

    /** å¤‡æ³¨ */
    @Excel(name = "备注")
    private String remark;

    public static YwUnitVO getVoByEntity(@NonNull YwUnit entity, YwUnitVO vo) {

 ycl-pojo/src/main/java/com/ycl/system/entity/SysDept.java

@@ -31,6 +31,8 @@
    /** éƒ¨é—¨åç§° */
    private String deptName;

    /** åŒºåŸŸåç§° */
    private String area;
    /** æ˜¾ç¤ºé¡ºåº */
    private Integer orderNum;

@@ -54,6 +56,14 @@
    
    /** å­éƒ¨é—¨ */
    private List<SysDept> children = new ArrayList<SysDept>();

    public String getArea() {
        return area;
    }

    public void setArea(String area) {
        this.area = area;
    }

    public Long getDeptId()
    {
@@ -183,21 +193,20 @@

    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
            .append("deptId", getDeptId())
            .append("parentId", getParentId())
            .append("ancestors", getAncestors())
            .append("deptName", getDeptName())
            .append("orderNum", getOrderNum())
            .append("leader", getLeader())
            .append("phone", getPhone())
            .append("email", getEmail())
            .append("status", getStatus())
            .append("delFlag", getDelFlag())
            .append("createBy", getCreateBy())
            .append("createTime", getCreateTime())
            .append("updateBy", getUpdateBy())
            .append("updateTime", getUpdateTime())
            .toString();
        return "SysDept{" +
                "deptId=" + deptId +
                ", parentId=" + parentId +
                ", ancestors='" + ancestors + '\'' +
                ", deptName='" + deptName + '\'' +
                ", area='" + area + '\'' +
                ", orderNum=" + orderNum +
                ", leader='" + leader + '\'' +
                ", phone='" + phone + '\'' +
                ", email='" + email + '\'' +
                ", status='" + status + '\'' +
                ", delFlag='" + delFlag + '\'' +
                ", parentName='" + parentName + '\'' +
                ", children=" + children +
                '}';
    }
}

 ycl-server/src/main/java/com/ycl/platform/controller/CheckRuleController.java

@@ -2,6 +2,8 @@

import annotation.Log;
import com.ycl.platform.domain.entity.CheckRule;
import com.ycl.platform.domain.query.CheckRuleQuery;
import com.ycl.platform.domain.vo.CheckRuleVO;
import com.ycl.platform.service.ICheckRuleService;
import com.ycl.system.AjaxResult;
import com.ycl.system.controller.BaseController;
@@ -33,11 +35,11 @@
     * æŸ¥è¯¢è€ƒæ ¸è§„则列表
     */
    @PreAuthorize("@ss.hasPermi('system:rule:list')")
    @GetMapping("/list")
    public TableDataInfo list(CheckRule checkRule)
    @PostMapping("/list")
    public TableDataInfo list(@RequestBody CheckRuleQuery checkRuleQuery)
    {
        startPage();
        List<CheckRule> list = checkRuleService.selectCheckRuleList(checkRule);
        List<CheckRuleVO> list = checkRuleService.selectCheckRuleList(checkRuleQuery);
        return getDataTable(list);
    }

@@ -47,10 +49,10 @@
    @PreAuthorize("@ss.hasPermi('system:rule:export')")
    @Log(title = "考核规则", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, CheckRule checkRule)
    public void export(HttpServletResponse response, CheckRuleQuery checkRuleQuery)
    {
        List<CheckRule> list = checkRuleService.selectCheckRuleList(checkRule);
        ExcelUtil<CheckRule> util = new ExcelUtil<CheckRule>(CheckRule.class);
        List<CheckRuleVO> list = checkRuleService.selectCheckRuleList(checkRuleQuery);
        ExcelUtil<CheckRuleVO> util = new ExcelUtil<CheckRuleVO>(CheckRuleVO.class);
        util.exportExcel(response, list, "考核规则数据");
    }


 ycl-server/src/main/java/com/ycl/platform/controller/CheckTemplateController.java

@@ -2,12 +2,15 @@

import annotation.Log;
import com.ycl.platform.domain.entity.CheckTemplate;
import com.ycl.platform.domain.query.CheckTemplateQuery;
import com.ycl.platform.service.ICheckTemplateService;
import com.ycl.system.AjaxResult;
import com.ycl.system.Result;
import com.ycl.system.controller.BaseController;
import com.ycl.system.page.TableDataInfo;
import com.ycl.utils.poi.ExcelUtil;
import enumeration.BusinessType;
import io.swagger.annotations.ApiOperation;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -33,10 +36,10 @@
     */
    @PreAuthorize("@ss.hasPermi('system:template:list')")
    @GetMapping("/list")
    public TableDataInfo list(CheckTemplate checkTemplate)
    public TableDataInfo list(CheckTemplateQuery checkTemplateDTO)
    {
        startPage();
        List<CheckTemplate> list = checkTemplateService.selectCheckTemplateList(checkTemplate);
        List<CheckTemplate> list = checkTemplateService.selectCheckTemplateList(checkTemplateDTO);
        return getDataTable(list);
    }

@@ -46,9 +49,9 @@
    @PreAuthorize("@ss.hasPermi('system:template:export')")
    @Log(title = "考核模板", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, CheckTemplate checkTemplate)
    public void export(HttpServletResponse response, CheckTemplateQuery checkTemplateDTO)
    {
        List<CheckTemplate> list = checkTemplateService.selectCheckTemplateList(checkTemplate);
        List<CheckTemplate> list = checkTemplateService.selectCheckTemplateList(checkTemplateDTO);
        ExcelUtil<CheckTemplate> util = new ExcelUtil<CheckTemplate>(CheckTemplate.class);
        util.exportExcel(response, list, "考核模板数据");
    }
@@ -69,9 +72,9 @@
    @PreAuthorize("@ss.hasPermi('system:template:add')")
    @Log(title = "考核模板", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody CheckTemplate checkTemplate)
    public AjaxResult add(@RequestBody CheckTemplateQuery checkTemplateDTO)
    {
        return toAjax(checkTemplateService.insertCheckTemplate(checkTemplate));
        return toAjax(checkTemplateService.insertCheckTemplate(checkTemplateDTO));
    }

    /**
@@ -95,4 +98,10 @@
    {
        return toAjax(checkTemplateService.deleteCheckTemplateByIds(ids));
    }

    @GetMapping("/pullList")
    @ApiOperation(value = "列表", notes = "列表")
    public Result pullList() {
        return checkTemplateService.pullList();
    }
}

 ycl-server/src/main/java/com/ycl/platform/controller/ReportController.java

@@ -1,7 +1,13 @@
package com.ycl.platform.controller;

import com.ycl.platform.domain.entity.Report;
import com.ycl.platform.domain.entity.TMonitor;
import com.ycl.platform.domain.vo.ReportVO;
import com.ycl.platform.domain.vo.TMonitorVO;
import com.ycl.system.domain.group.Update;
import com.ycl.system.domain.group.Add;
import com.ycl.utils.poi.ExcelUtil;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.validation.annotation.Validated;
import lombok.RequiredArgsConstructor;
import java.util.List;
@@ -72,4 +78,12 @@
    public Result list() {
        return reportService.all();
    }

    @PostMapping("/export")
    public void export(HttpServletResponse response, ReportQuery query)
    {
        List<ReportVO> list = reportService.export(query);
        ExcelUtil<ReportVO> util = new ExcelUtil<>(ReportVO.class);
        util.exportExcel(response, list, "运维单位");
    }
}

 ycl-server/src/main/java/com/ycl/platform/controller/YwPeopleController.java

@@ -67,6 +67,12 @@
        return ywPeopleService.detail(id);
    }

    @GetMapping("/getPeopleByUnitId/{id}")
    @ApiOperation(value = "详情", notes = "详情")
    public Result getPeopleByUnitId(@PathVariable("id") String id) {
        return ywPeopleService.getPeopleByUnitId(id);
    }

    @GetMapping("/list")
    @ApiOperation(value = "列表", notes = "列表")
    public Result list() {

 ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java

@@ -1,11 +1,16 @@
package com.ycl.platform.controller;

import com.ycl.platform.domain.query.ReportQuery;
import com.ycl.platform.domain.vo.ReportVO;
import com.ycl.platform.domain.vo.YwUnitVO;
import com.ycl.system.Result;
import com.ycl.platform.domain.form.YwUnitForm;
import com.ycl.system.domain.group.Update;
import com.ycl.system.domain.group.Add;
import com.ycl.platform.domain.query.YwUnitQuery;
import com.ycl.platform.service.YwUnitService;
import com.ycl.utils.poi.ExcelUtil;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import lombok.RequiredArgsConstructor;
@@ -73,4 +78,12 @@
    public Result list() {
        return ywUnitService.all();
    }

    @PostMapping("/export")
    public void export(HttpServletResponse response, YwUnitQuery query)
    {
        List<YwUnitVO> list = ywUnitService.export(query);
        ExcelUtil<YwUnitVO> util = new ExcelUtil<>(YwUnitVO.class);
        util.exportExcel(response, list, "报备");
    }
}

 ycl-server/src/main/java/com/ycl/platform/mapper/CheckRuleMapper.java

@@ -1,6 +1,8 @@
package com.ycl.platform.mapper;

import com.ycl.platform.domain.entity.CheckRule;
import com.ycl.platform.domain.query.CheckRuleQuery;
import com.ycl.platform.domain.vo.CheckRuleVO;

import java.util.List;

@@ -18,15 +20,15 @@
     * @param id è€ƒæ ¸è§„则主键
     * @return è€ƒæ ¸è§„则
     */
    public CheckRule selectCheckRuleById(Long id);
    public CheckRuleVO selectCheckRuleById(Long id);

    /**
     * æŸ¥è¯¢è€ƒæ ¸è§„则列表
     * 
     * @param checkRule è€ƒæ ¸è§„则
     * @param checkRuleQuery è€ƒæ ¸è§„则
     * @return è€ƒæ ¸è§„则集合
     */
    public List<CheckRule> selectCheckRuleList(CheckRule checkRule);
    public List<CheckRuleVO> selectCheckRuleList(CheckRuleQuery checkRuleQuery);

    /**
     * æ–°å¢žè€ƒæ ¸è§„则

 ycl-server/src/main/java/com/ycl/platform/mapper/CheckTemplateMapper.java

@@ -1,6 +1,7 @@
package com.ycl.platform.mapper;

import com.ycl.platform.domain.entity.CheckTemplate;
import com.ycl.platform.domain.query.CheckTemplateQuery;

import java.util.List;

@@ -23,10 +24,10 @@
    /**
     * æŸ¥è¯¢è€ƒæ ¸æ¨¡æ¿åˆ—表
     * 
     * @param checkTemplate è€ƒæ ¸æ¨¡æ¿
     * @param checkTemplateDTO è€ƒæ ¸æ¨¡æ¿
     * @return è€ƒæ ¸æ¨¡æ¿é›†åˆ
     */
    public List<CheckTemplate> selectCheckTemplateList(CheckTemplate checkTemplate);
    public List<CheckTemplate> selectCheckTemplateList(CheckTemplateQuery checkTemplateDTO);

    /**
     * æ–°å¢žè€ƒæ ¸æ¨¡æ¿

 ycl-server/src/main/java/com/ycl/platform/service/ICheckRuleService.java

@@ -1,6 +1,8 @@
package com.ycl.platform.service;

import com.ycl.platform.domain.entity.CheckRule;
import com.ycl.platform.domain.query.CheckRuleQuery;
import com.ycl.platform.domain.vo.CheckRuleVO;

import java.util.List;

@@ -18,15 +20,15 @@
     * @param id è€ƒæ ¸è§„则主键
     * @return è€ƒæ ¸è§„则
     */
    public CheckRule selectCheckRuleById(Long id);
    public CheckRuleVO selectCheckRuleById(Long id);

    /**
     * æŸ¥è¯¢è€ƒæ ¸è§„则列表
     * 
     * @param checkRule è€ƒæ ¸è§„则
     * @param checkRuleQuery è€ƒæ ¸è§„则
     * @return è€ƒæ ¸è§„则集合
     */
    public List<CheckRule> selectCheckRuleList(CheckRule checkRule);
    public List<CheckRuleVO> selectCheckRuleList(CheckRuleQuery checkRuleQuery);

    /**
     * æ–°å¢žè€ƒæ ¸è§„则

 ycl-server/src/main/java/com/ycl/platform/service/ICheckTemplateService.java

@@ -1,6 +1,8 @@
package com.ycl.platform.service;

import com.ycl.platform.domain.entity.CheckTemplate;
import com.ycl.platform.domain.query.CheckTemplateQuery;
import com.ycl.system.Result;

import java.util.List;

@@ -18,23 +20,23 @@
     * @param id è€ƒæ ¸æ¨¡æ¿ä¸»é”®
     * @return è€ƒæ ¸æ¨¡æ¿
     */
    public CheckTemplate selectCheckTemplateById(Long id);
    public CheckTemplateQuery selectCheckTemplateById(Long id);

    /**
     * æŸ¥è¯¢è€ƒæ ¸æ¨¡æ¿åˆ—表
     * 
     * @param checkTemplate è€ƒæ ¸æ¨¡æ¿
     * @param checkTemplateDTO è€ƒæ ¸æ¨¡æ¿
     * @return è€ƒæ ¸æ¨¡æ¿é›†åˆ
     */
    public List<CheckTemplate> selectCheckTemplateList(CheckTemplate checkTemplate);
    public List<CheckTemplate> selectCheckTemplateList(CheckTemplateQuery checkTemplateDTO);

    /**
     * æ–°å¢žè€ƒæ ¸æ¨¡æ¿
     * 
     * @param checkTemplate è€ƒæ ¸æ¨¡æ¿
     * @param checkTemplateDTO è€ƒæ ¸æ¨¡æ¿
     * @return ç»“æžœ
     */
    public int insertCheckTemplate(CheckTemplate checkTemplate);
    public int insertCheckTemplate(CheckTemplateQuery checkTemplateDTO);

    /**
     * ä¿®æ”¹è€ƒæ ¸æ¨¡æ¿
@@ -59,4 +61,7 @@
     * @return ç»“æžœ
     */
    public int deleteCheckTemplateById(Long id);

    Result pullList();

}

 ycl-server/src/main/java/com/ycl/platform/service/ReportService.java

@@ -2,6 +2,7 @@

import com.ycl.platform.domain.entity.Report;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.platform.domain.vo.ReportVO;
import com.ycl.system.Result;
import com.ycl.platform.domain.form.ReportForm;
import com.ycl.platform.domain.query.ReportQuery;
@@ -62,4 +63,10 @@
     * @return
     */
    Result all();

    /**
     * å¯¼å‡º
     * @return
     */
    List<ReportVO> export(ReportQuery query);
}

 ycl-server/src/main/java/com/ycl/platform/service/YwPeopleService.java

@@ -62,4 +62,11 @@
     * @return
     */
    Result all();

    /**
     * æ ¹æ®è¿ç»´å•ä½æŸ¥è¯¢è¿ç»´äººå‘˜è¯¦ç»†
     * @param id id
     * @return è¿ç»´äººå‘˜
     */
    Result getPeopleByUnitId(String id);
}

 ycl-server/src/main/java/com/ycl/platform/service/YwUnitService.java

@@ -2,6 +2,9 @@

import com.baomidou.mybatisplus.extension.service.IService;

import com.ycl.platform.domain.query.ReportQuery;
import com.ycl.platform.domain.vo.ReportVO;
import com.ycl.platform.domain.vo.YwUnitVO;
import com.ycl.system.Result;
import com.ycl.platform.domain.entity.YwUnit;
import com.ycl.platform.domain.form.YwUnitForm;
@@ -64,4 +67,10 @@
     * @return
     */
    Result all();

    /**
     * å¯¼å‡º
     * @return
     */
    List<YwUnitVO> export(YwUnitQuery query);
}

 ycl-server/src/main/java/com/ycl/platform/service/impl/CheckRuleServiceImpl.java

@@ -1,6 +1,8 @@
package com.ycl.platform.service.impl;

import com.ycl.platform.domain.entity.CheckRule;
import com.ycl.platform.domain.query.CheckRuleQuery;
import com.ycl.platform.domain.vo.CheckRuleVO;
import com.ycl.platform.mapper.CheckRuleMapper;
import com.ycl.platform.service.ICheckRuleService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -28,7 +30,7 @@
     * @return è€ƒæ ¸è§„则
     */
    @Override
    public CheckRule selectCheckRuleById(Long id)
    public CheckRuleVO selectCheckRuleById(Long id)
    {
        return checkRuleMapper.selectCheckRuleById(id);
    }
@@ -36,13 +38,13 @@
    /**
     * æŸ¥è¯¢è€ƒæ ¸è§„则列表
     * 
     * @param checkRule è€ƒæ ¸è§„则
     * @param checkRuleQuery è€ƒæ ¸è§„则
     * @return è€ƒæ ¸è§„则
     */
    @Override
    public List<CheckRule> selectCheckRuleList(CheckRule checkRule)
    public List<CheckRuleVO> selectCheckRuleList(CheckRuleQuery checkRuleQuery)
    {
        return checkRuleMapper.selectCheckRuleList(checkRule);
        return checkRuleMapper.selectCheckRuleList(checkRuleQuery);
    }

    /**

 ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java

@@ -1,97 +1,143 @@
package com.ycl.platform.service.impl;

import com.ycl.platform.base.BaseSelect;
import com.ycl.platform.domain.entity.CheckTemplate;
import com.ycl.platform.domain.query.CheckTemplateQuery;
import com.ycl.platform.mapper.CheckTemplateMapper;
import com.ycl.platform.service.ICheckTemplateService;
import com.ycl.system.Result;
import com.ycl.system.entity.SysDept;
import com.ycl.system.service.ISysDeptService;
import io.jsonwebtoken.lang.Collections;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Service;
import utils.DateUtils;
import utils.StringUtils;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

/**
 * è€ƒæ ¸æ¨¡æ¿Service业务层处理
 * 
 *
 * @author ruoyi
 * @date 2024-04-01
 */
@Service
public class CheckTemplateServiceImpl implements ICheckTemplateService 
{
public class CheckTemplateServiceImpl implements ICheckTemplateService {
    @Autowired
    private CheckTemplateMapper checkTemplateMapper;
    @Autowired
    private ISysDeptService deptService;

    /**
     * æŸ¥è¯¢è€ƒæ ¸æ¨¡æ¿
     * 
     *
     * @param id è€ƒæ ¸æ¨¡æ¿ä¸»é”®
     * @return è€ƒæ ¸æ¨¡æ¿
     */
    @Override
    public CheckTemplate selectCheckTemplateById(Long id)
    {
        return checkTemplateMapper.selectCheckTemplateById(id);
    public CheckTemplateQuery selectCheckTemplateById(Long id) {
        CheckTemplate checkTemplate = checkTemplateMapper.selectCheckTemplateById(id);
        CheckTemplateQuery checkTemplateQuery = new CheckTemplateQuery();
        BeanUtils.copyProperties(checkTemplate,checkTemplateQuery);
        String deptId = checkTemplate.getDeptId();
        String deptIdStr = deptId.substring(1, deptId.length() - 1);
        List<Integer> deptIds = Arrays.stream(deptIdStr.split(","))
                .mapToInt(Integer::parseInt)
                .boxed().collect(Collectors.toList());
        checkTemplateQuery.setDeptId(deptIds);
        return checkTemplateQuery;
    }

    /**
     * æŸ¥è¯¢è€ƒæ ¸æ¨¡æ¿åˆ—表
     * 
     * @param checkTemplate è€ƒæ ¸æ¨¡æ¿
     *
     * @param checkTemplateDTO è€ƒæ ¸æ¨¡æ¿
     * @return è€ƒæ ¸æ¨¡æ¿
     */
    @Override
    public List<CheckTemplate> selectCheckTemplateList(CheckTemplate checkTemplate)
    {
        return checkTemplateMapper.selectCheckTemplateList(checkTemplate);
    public List<CheckTemplate> selectCheckTemplateList(CheckTemplateQuery checkTemplateDTO) {
        List<CheckTemplate> checkTemplates = checkTemplateMapper.selectCheckTemplateList(checkTemplateDTO);
        //部门区域下拉列表
        Result all = deptService.pullList();
        List<BaseSelect> data = (List<BaseSelect>) all.get("data");
        //翻译部门id
        for (CheckTemplate template : checkTemplates) {
            if(template.getDeptId() == null)continue;
            String[] deptIds = template.getDeptId().replace("[", "").replace("]", "").split(",");
            List<String> deptName = new ArrayList<>();
            for (String deptId : deptIds) {
                List<String> deptStr = data.stream()
                        .filter(baseSelect -> baseSelect.getId().equals(Integer.parseInt(deptId)))
                        .map(BaseSelect::getValue)
                        .collect(Collectors.toList());
                deptName.addAll(deptStr);
            }
            template.setDeptId(StringUtils.join(deptName,","));
        }

        return checkTemplates;
    }

    /**
     * æ–°å¢žè€ƒæ ¸æ¨¡æ¿
     * 
     * @param checkTemplate è€ƒæ ¸æ¨¡æ¿
     *
     * @param checkTemplateDTO è€ƒæ ¸æ¨¡æ¿
     * @return ç»“æžœ
     */
    @Override
    public int insertCheckTemplate(CheckTemplate checkTemplate)
    {
        checkTemplate.setCreateTime(DateUtils.getNowDate());
    public int insertCheckTemplate(CheckTemplateQuery checkTemplateDTO) {
        checkTemplateDTO.setCreateTime(DateUtils.getNowDate());
        CheckTemplate checkTemplate = new CheckTemplate();
        BeanUtils.copyProperties(checkTemplateDTO,checkTemplate);
        checkTemplate.setDeptId(checkTemplateDTO.getDeptId().toString().replaceAll(" ",""));
        return checkTemplateMapper.insertCheckTemplate(checkTemplate);
    }

    /**
     * ä¿®æ”¹è€ƒæ ¸æ¨¡æ¿
     * 
     *
     * @param checkTemplate è€ƒæ ¸æ¨¡æ¿
     * @return ç»“æžœ
     */
    @Override
    public int updateCheckTemplate(CheckTemplate checkTemplate)
    {
    public int updateCheckTemplate(CheckTemplate checkTemplate) {
        checkTemplate.setUpdateTime(DateUtils.getNowDate());
        return checkTemplateMapper.updateCheckTemplate(checkTemplate);
    }

    /**
     * æ‰¹é‡åˆ é™¤è€ƒæ ¸æ¨¡æ¿
     * 
     *
     * @param ids éœ€è¦åˆ é™¤çš„考核模板主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteCheckTemplateByIds(Long[] ids)
    {
    public int deleteCheckTemplateByIds(Long[] ids) {
        return checkTemplateMapper.deleteCheckTemplateByIds(ids);
    }

    /**
     * åˆ é™¤è€ƒæ ¸æ¨¡æ¿ä¿¡æ¯
     * 
     *
     * @param id è€ƒæ ¸æ¨¡æ¿ä¸»é”®
     * @return ç»“æžœ
     */
    @Override
    public int deleteCheckTemplateById(Long id)
    {
    public int deleteCheckTemplateById(Long id) {
        return checkTemplateMapper.deleteCheckTemplateById(id);
    }

    @Override
    public Result pullList() {
        List<CheckTemplate> checkTemplates = checkTemplateMapper.selectCheckTemplateList(new CheckTemplateQuery());

        return Result.ok().data(checkTemplates);
    }
}

 ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java

@@ -1,34 +1,35 @@
package com.ycl.platform.service.impl;

import com.ycl.platform.domain.entity.Region;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.platform.domain.entity.Report;
import com.ycl.platform.domain.entity.YwPeople;
import com.ycl.platform.domain.entity.YwPoint;
import com.ycl.platform.domain.entity.YwUnit;
import com.ycl.platform.mapper.RegionMapper;
import com.ycl.platform.domain.form.ReportForm;
import com.ycl.platform.domain.query.ReportQuery;
import com.ycl.platform.domain.vo.ReportVO;
import com.ycl.platform.mapper.ReportMapper;
import com.ycl.platform.mapper.YwPeopleMapper;
import com.ycl.platform.mapper.YwPointMapper;
import com.ycl.platform.mapper.YwUnitMapper;
import com.ycl.platform.service.ReportService;
import com.ycl.system.Result;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.platform.domain.form.ReportForm;
import com.ycl.platform.domain.vo.ReportVO;
import com.ycl.platform.domain.query.ReportQuery;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.system.page.PageUtil;
import org.springframework.stereotype.Service;
import org.springframework.security.core.context.SecurityContextHolder;
import com.ycl.utils.SecurityUtils;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;

import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import lombok.RequiredArgsConstructor;

/**
 * æŠ¥å¤‡ æœåŠ¡å®žçŽ°ç±»
@@ -40,10 +41,9 @@
@RequiredArgsConstructor
public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> implements ReportService {

    private final ReportMapper reportMapper;
    private final YwUnitMapper unitMapper;
    private final YwPointMapper ywpointMapper;
    private final YwPeopleMapper peopleMapper;
    private final RegionMapper regionMapper;

    /**
     * æ·»åŠ 
@@ -52,9 +52,12 @@
     */
    @Override
    public Result add(ReportForm form) {
        form.setPeopleId(1);
        form.setUnitId(2);
        Long userId = SecurityUtils.getUserId();
        YwPeople people = new LambdaQueryChainWrapper<>(peopleMapper).eq(YwPeople::getUserId, userId).one();
        form.setPeopleId(people.getId());
        form.setUnitId(people.getBelongUnit());
        Report entity = ReportForm.getEntityByForm(form, null);
        entity.setStatus(0);
        if(baseMapper.insert(entity) > 0) {
            return Result.ok("添加成功");
        }
@@ -114,10 +117,29 @@
    @Override
    public Result page(ReportQuery query) {

        if (StringUtils.isNotBlank(query.getPointId())) {
            LambdaQueryWrapper<YwPoint> queryWrapper = new LambdaQueryWrapper<>();
            queryWrapper.like(YwPoint::getPointName, query.getPointId());
            query.setPointIdList(ywpointMapper.selectList(queryWrapper).stream().map(YwPoint::getId).collect(Collectors.toList()));
            if(CollectionUtils.isEmpty(query.getPointIdList())) {
                return Result.ok();
            }
        }
        if (StringUtils.isNotBlank(query.getPeopleId())) {
            LambdaQueryWrapper<YwPeople> queryWrapper = new LambdaQueryWrapper<>();
            queryWrapper.like(YwPeople::getYwPersonName, query.getPeopleId());
            query.setPeopleIdList(peopleMapper.selectList(queryWrapper).stream().map(YwPeople::getId).collect(Collectors.toList()));
            if(CollectionUtils.isEmpty(query.getPeopleIdList())) {
                return Result.ok();
            }
        }

        IPage<Report> page = new LambdaQueryChainWrapper<>(baseMapper)
                .eq(StringUtils.isNotBlank(query.getReportType()), Report::getReportType, query.getReportType())
                .le(Objects.nonNull(query.getBeginCreateTime()), Report::getBeginCreateTime, query.getBeginCreateTime())
                .ge(Objects.nonNull(query.getEndCreateTime()), Report::getEndCreateTime, query.getEndCreateTime())
                .in(!CollectionUtils.isEmpty(query.getPointIdList()), Report::getPointId, query.getPointIdList())
                .in(!CollectionUtils.isEmpty(query.getPeopleIdList()), Report::getPeopleId, query.getPeopleIdList())
                .orderByDesc(Report::getCreateTime)
                .page(PageUtil.getPage(query, Report.class));

@@ -129,8 +151,8 @@
                            vo.setUnitName(unit.getUnitName());
                            YwPeople ywPeople = peopleMapper.selectById(vo.getPeopleId());
                            vo.setPeopleName(ywPeople.getYwPersonName());
                            Region region = regionMapper.selectById(vo.getPointId());
                            vo.setPointName(region.getFullName());
                            YwPoint ywPoint = ywpointMapper.selectById(vo.getPointId());
                            vo.setPointName(ywPoint.getPointName());
                            return vo;
                        }
                )
@@ -166,4 +188,50 @@
                .collect(Collectors.toList());
        return Result.ok().data(vos);
    }

    public List<ReportVO> export(ReportQuery query) {

        if (StringUtils.isNotBlank(query.getPointId())) {
            LambdaQueryWrapper<YwPoint> queryWrapper = new LambdaQueryWrapper<>();
            queryWrapper.like(YwPoint::getPointName, query.getPointId());
            query.setPointIdList(ywpointMapper.selectList(queryWrapper).stream().map(YwPoint::getId).collect(Collectors.toList()));
            if(CollectionUtils.isEmpty(query.getPointIdList())) {
                return new ArrayList<>();
            }
        }
        if (StringUtils.isNotBlank(query.getPeopleId())) {
            LambdaQueryWrapper<YwPeople> queryWrapper = new LambdaQueryWrapper<>();
            queryWrapper.like(YwPeople::getYwPersonName, query.getPeopleId());
            query.setPeopleIdList(peopleMapper.selectList(queryWrapper).stream().map(YwPeople::getId).collect(Collectors.toList()));
            if(CollectionUtils.isEmpty(query.getPeopleIdList())) {
                return new ArrayList<>();
            }
        }

        IPage<Report> page = new LambdaQueryChainWrapper<>(baseMapper)
                .eq(StringUtils.isNotBlank(query.getReportType()), Report::getReportType, query.getReportType())
                .le(Objects.nonNull(query.getBeginCreateTime()), Report::getBeginCreateTime, query.getBeginCreateTime())
                .ge(Objects.nonNull(query.getEndCreateTime()), Report::getEndCreateTime, query.getEndCreateTime())
                .in(!CollectionUtils.isEmpty(query.getPointIdList()), Report::getPointId, query.getPointIdList())
                .in(!CollectionUtils.isEmpty(query.getPeopleIdList()), Report::getPeopleId, query.getPeopleIdList())
                .orderByDesc(Report::getCreateTime)
                .page(PageUtil.getPage(query, Report.class));

        List<ReportVO> vos = page.getRecords().stream()
                .map(
                        entity -> {
                            ReportVO vo = ReportVO.getVoByEntity(entity, null);
                            YwUnit unit = unitMapper.selectById(vo.getUnitId());
                            vo.setUnitName(unit.getUnitName());
                            YwPeople ywPeople = peopleMapper.selectById(vo.getPeopleId());
                            vo.setPeopleName(ywPeople.getYwPersonName());
                            YwPoint ywPoint = ywpointMapper.selectById(vo.getPointId());
                            vo.setPointName(ywPoint.getPointName());
                            return vo;
                        }
                )
                .collect(Collectors.toList());
        return vos;
    }

}

 ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java

@@ -56,6 +56,10 @@
    @Override
    public Result add(WorkOrderForm form) {
        WorkOrder entity = WorkOrderForm.getEntityByForm(form, null);
        entity.setWorkOrderNo(DateUtils.dateTimeNow());
        entity.setCreateTime(DateUtils.getNowDate());
        entity.setStatus(WorkOrderStatusEnum.WAIT_DISTRIBUTE);
        entity.setDeleted("0");
        if(baseMapper.insert(entity) > 0) {
            return Result.ok("添加成功");
        }

 ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java

@@ -198,4 +198,12 @@
                .collect(Collectors.toList());
        return Result.ok().data(vos);
    }

    @Override
    public Result getPeopleByUnitId(String id) {
        List<YwPeople> entities = new LambdaQueryChainWrapper<>(baseMapper)
                .eq(YwPeople::getBelongUnit, id)
                .list();
        return Result.ok().data(entities);
    }
}

 ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java

@@ -212,14 +212,14 @@
            unitId = people.getBelongUnit();
        }

        List<Region> list = new LambdaQueryChainWrapper<>(regionMapper)
                .eq(Region::getRegionLevel, RegionLevelEnum.STREET)
                .like(Region::getFullName, keyword)
        List<YwPoint> list = new LambdaQueryChainWrapper<>(baseMapper)
                .eq(YwPoint::getUnitId, unitId)
                .like(YwPoint::getPointName, keyword)
                .list();
        List<BaseSelect> data = list.stream().map(item -> {
            BaseSelect baseSelect = new BaseSelect();
            baseSelect.setId(item.getId());
            baseSelect.setValue(item.getFullName());
            baseSelect.setValue(item.getPointName());
            return baseSelect;
        }).collect(Collectors.toList());
        return Result.ok().data(data);

 ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java

@@ -158,4 +158,25 @@
                .collect(Collectors.toList());
        return Result.ok().data(vos);
    }

    @Override
    public List<YwUnitVO> export(YwUnitQuery query) {
        // åˆ†é¡µæ¡ä»¶æŸ¥è¯¢ä½ 
        IPage<YwUnit> page = new LambdaQueryChainWrapper<>(baseMapper)
                .eq(StringUtils.hasText(query.getUnitCode()), YwUnit::getUnitCode, query.getUnitCode())
                .like(StringUtils.hasText(query.getUnitName()), YwUnit::getUnitName, query.getUnitName())
                .between(Objects.nonNull(query.getStart()) && Objects.nonNull(query.getEnd()),
                        YwUnit::getCreateTime,
                        DateUtils.getDayStart(query.getStart()),
                        DateUtils.getDayEnd(query.getEnd()))
                .orderByDesc(YwUnit::getCreateTime)
                .page(PageUtil.getPage(query, YwUnit.class));

        List<YwUnitVO> vos = page.getRecords().stream()
                .map(
                        entity -> YwUnitVO.getVoByEntity(entity, null)
                )
                .collect(Collectors.toList());
        return vos;
    }
}

 ycl-server/src/main/java/com/ycl/system/controller/SysDeptController.java

@@ -128,4 +128,10 @@
    public Result all() {
        return deptService.all();
    }

    @GetMapping("/pullList")
    @ApiOperation(value = "区域下拉列表", notes = "区域下拉列表")
    public Result pullList() {
        return deptService.pullList();
    }
}

 ycl-server/src/main/java/com/ycl/system/service/ISysDeptService.java

@@ -128,4 +128,10 @@
     * @return
     */
    Result all();

    /**
     * åŒºåŸŸåˆ—表
     * @return
     */
    Result pullList();
}

 ycl-server/src/main/java/com/ycl/system/service/impl/SysDeptServiceImpl.java

@@ -296,6 +296,10 @@
        return deptMapper.deleteDeptById(deptId);
    }

    /**
     * éƒ¨é—¨ä¸‹æ‹‰åˆ—表
     * @return
     */
    @Override
    public Result all() {
        List<BaseSelect> vos = deptMapper.selectDeptList(new SysDept()).stream().map(sysDept -> {
@@ -307,6 +311,21 @@
        ).collect(Collectors.toList());
        return Result.ok().data(vos);
    }
    /**
     * åŒºåŸŸä¸‹æ‹‰åˆ—表
     * @return
     */
    @Override
    public Result pullList() {
        List<BaseSelect> vos = deptMapper.selectDeptList(new SysDept()).stream().filter(sysDept -> sysDept.getArea()!=null).map(sysDept -> {
                    BaseSelect baseSelect = new BaseSelect();
                    baseSelect.setId(Integer.parseInt(sysDept.getDeptId() + ""));
                    baseSelect.setValue(sysDept.getArea());
                    return baseSelect;
                }
        ).collect(Collectors.toList());
        return Result.ok().data(vos);
    }

    /**
     * é€’归列表

 ycl-server/src/main/resources/application-dev.yml

@@ -38,7 +38,7 @@
  datasource:
    url: jdbc:mysql://101.35.247.188:3306/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false
    username: root
    password: 123456
    password: ycl@202466
    type: com.alibaba.druid.pool.DruidDataSource
    driver-class-name: com.mysql.cj.jdbc.Driver


 ycl-server/src/main/resources/application-prod.yml

@@ -38,7 +38,7 @@
  datasource:
    url: jdbc:mysql://101.35.247.188:3306/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false
    username: root
    password: 123456
    password: ycl@202466
    type: com.alibaba.druid.pool.DruidDataSource
    driver-class-name: com.mysql.cj.jdbc.Driver


 ycl-server/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -9,6 +9,7 @@
        <result property="parentId"   column="parent_id"   />
        <result property="ancestors"  column="ancestors"   />
        <result property="deptName"   column="dept_name"   />
        <result property="area"   column="area"   />
        <result property="orderNum"   column="order_num"   />
        <result property="leader"     column="leader"      />
        <result property="phone"      column="phone"       />
@@ -23,7 +24,7 @@
    </resultMap>
    
    <sql id="selectDeptVo">
        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time 
        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time,d.area
        from sys_dept d
    </sql>
    
@@ -59,7 +60,7 @@
    </select>
    
    <select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,
        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,d.area,
            (select dept_name from sys_dept where dept_id = d.parent_id) parent_name
        from sys_dept d
        where d.dept_id = #{deptId}
@@ -120,6 +121,7 @@
         <set>
             <if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
             <if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
             <if test="area != null and area != ''">area = #{area},</if>
             <if test="ancestors != null and ancestors != ''">ancestors = #{ancestors},</if>
             <if test="orderNum != null">order_num = #{orderNum},</if>
             <if test="leader != null">leader = #{leader},</if>

 ycl-server/src/main/resources/mapper/zgyw/CalculateRecordMapper.xml

@@ -9,13 +9,13 @@
        <result property="date"    column="date"    />
        <result property="ruleId"    column="rule_id"    />
        <result property="unitId"    column="unit_id"    />
        <result property="totalMount"    column="totalMount"    />
        <result property="totalAmount"    column="total_amount"    />
        <result property="deductAmount"    column="deduct_amount"    />
        <result property="score"    column="score"    />
    </resultMap>

    <sql id="selectCalculateRecordVo">
        select id, date, rule_id, unit_id, totalMount, deduct_amount, score from t_calculate_record
        select id, date, rule_id, unit_id, total_amount, deduct_amount, score from t_calculate_record
    </sql>

    <select id="selectCalculateRecordList" resultMap="CalculateRecordResult">
@@ -24,7 +24,7 @@
            <if test="date != null "> and date = #{date}</if>
            <if test="ruleId != null "> and rule_id = #{ruleId}</if>
            <if test="unitId != null "> and unit_id = #{unitId}</if>
            <if test="totalMount != null "> and totalMount = #{totalMount}</if>
            <if test="totalAmount != null "> and total_amount = #{totalAmount}</if>
            <if test="deductAmount != null "> and deduct_amount = #{deductAmount}</if>
            <if test="score != null "> and score = #{score}</if>
        </where>
@@ -42,7 +42,7 @@
            <if test="date != null">date,</if>
            <if test="ruleId != null">rule_id,</if>
            <if test="unitId != null">unit_id,</if>
            <if test="totalMount != null">totalMount,</if>
            <if test="totalAmount != null">total_amount,</if>
            <if test="deductAmount != null">deduct_amount,</if>
            <if test="score != null">score,</if>
         </trim>
@@ -51,7 +51,7 @@
            <if test="date != null">#{date},</if>
            <if test="ruleId != null">#{ruleId},</if>
            <if test="unitId != null">#{unitId},</if>
            <if test="totalMount != null">#{totalMount},</if>
            <if test="totalAmount != null">#{totalAmount},</if>
            <if test="deductAmount != null">#{deductAmount},</if>
            <if test="score != null">#{score},</if>
         </trim>
@@ -63,7 +63,7 @@
            <if test="date != null">date = #{date},</if>
            <if test="ruleId != null">rule_id = #{ruleId},</if>
            <if test="unitId != null">unit_id = #{unitId},</if>
            <if test="totalMount != null">totalMount = #{totalMount},</if>
            <if test="totalAmount != null">total_amount = #{totalAmount},</if>
            <if test="deductAmount != null">deduct_amount = #{deductAmount},</if>
            <if test="score != null">score = #{score},</if>
        </trim>

 ycl-server/src/main/resources/mapper/zgyw/CheckRuleMapper.xml

@@ -7,11 +7,10 @@
    <resultMap type="com.ycl.platform.domain.entity.CheckRule" id="CheckRuleResult">
        <result property="id"    column="id"    />
        <result property="ruleName"    column="rule_name"    />
        <result property="ruleDetail"    column="rule_detail"    />
        <result property="ruleIndex"    column="rule_index"    />
        <result property="ruleCategory"    column="rule_category"    />
        <result property="examineCategory"    column="examine_category"    />
        <result property="ruleDescription"    column="rule_description"    />
        <result property="auditState"    column="audit_state"    />
        <result property="state"    column="state"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateTime"    column="update_time"    />
@@ -19,24 +18,28 @@
    </resultMap>

    <sql id="selectCheckRuleVo">
        select id, rule_name, rule_detail, rule_category, examine_category, rule_description, audit_state, state, create_time, update_time, deleted from t_check_rule
        select id, rule_name, rule_index, rule_category, examine_category, rule_description, state, create_time, update_time, deleted from t_check_rule
    </sql>

    <select id="selectCheckRuleList" resultMap="CheckRuleResult">
        <include refid="selectCheckRuleVo"/>
        <where>  
            <if test="ruleName != null  and ruleName != ''"> and rule_name like concat('%', #{ruleName}, '%')</if>
            <if test="ruleCategory != null "> and rule_category = #{ruleCategory}</if>
            <if test="examineCategory != null "> and examine_category = #{examineCategory}</if>
            <if test="ruleDescription != null  and ruleDescription != ''"> and rule_description = #{ruleDescription}</if>
            <if test="auditState != null "> and audit_state = #{auditState}</if>
            <if test="state != null "> and state = #{state}</if>
    <select id="selectCheckRuleList" resultType="com.ycl.platform.domain.vo.CheckRuleVO">
        select tcr.id, tcr.rule_name, tcr.rule_index, tcr.rule_category, tcr.examine_category, tcr.rule_description,
               tctr.weight, tctr.audit_state,tctr.check_template_id as templateId,tct.template_name
        from t_check_template_rule tctr inner join t_check_rule tcr on tcr.id = tctr.check_rule_id
        inner join t_check_template tct on tctr.check_template_id = tct.id
        <where>
            state = 0
            <if test="ruleName != null  and ruleName != ''"> and tcr.rule_name like concat(#{ruleName}, '%')</if>
            <if test="ruleCategory != null "> and tcr.rule_category = #{ruleCategory}</if>
            <if test="examineCategory != null "> and tcr.examine_category = #{examineCategory}</if>
            <if test="auditState != null "> and tctr.audit_state = #{auditState}</if>
            <if test="templateId != null "> and tctr.check_template_id = #{templateId}</if>
        </where>
    </select>
    
    <select id="selectCheckRuleById" resultMap="CheckRuleResult">
        <include refid="selectCheckRuleVo"/>
        where id = #{id}
    <select id="selectCheckRuleById" resultType="com.ycl.platform.domain.vo.CheckRuleVO">
        select tcr.id, tcr.rule_name, tcr.rule_index, tcr.rule_category, tcr.examine_category, tcr.rule_description, tctr.weight, tctr.audit_state,tctr.check_template_id as templateId
        from t_check_rule tcr inner join t_check_template_rule tctr on tcr.id = tctr.check_rule_id
        where tcr.id = #{id} and tcr.state = 0
    </select>
        
    <insert id="insertCheckRule" useGeneratedKeys="true" keyProperty="id">
@@ -47,7 +50,6 @@
            <if test="ruleCategory != null">rule_category,</if>
            <if test="examineCategory != null">examine_category,</if>
            <if test="ruleDescription != null">rule_description,</if>
            <if test="auditState != null">audit_state,</if>
            <if test="state != null">state,</if>
            <if test="createTime != null">create_time,</if>
            <if test="updateTime != null">update_time,</if>
@@ -55,11 +57,10 @@
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="ruleName != null and ruleName != ''">#{ruleName},</if>
            <if test="ruleDetail != null">#{ruleDetail},</if>
            <if test="ruleIndex != null">#{ruleIndex},</if>
            <if test="ruleCategory != null">#{ruleCategory},</if>
            <if test="examineCategory != null">#{examineCategory},</if>
            <if test="ruleDescription != null">#{ruleDescription},</if>
            <if test="auditState != null">#{auditState},</if>
            <if test="state != null">#{state},</if>
            <if test="createTime != null">#{createTime},</if>
            <if test="updateTime != null">#{updateTime},</if>
@@ -71,11 +72,10 @@
        update t_check_rule
        <trim prefix="SET" suffixOverrides=",">
            <if test="ruleName != null and ruleName != ''">rule_name = #{ruleName},</if>
            <if test="ruleDetail != null">rule_detail = #{ruleDetail},</if>
            <if test="ruleIndex != null">rule_index = #{ruleIndex},</if>
            <if test="ruleCategory != null">rule_category = #{ruleCategory},</if>
            <if test="examineCategory != null">examine_category = #{examineCategory},</if>
            <if test="ruleDescription != null">rule_description = #{ruleDescription},</if>
            <if test="auditState != null">audit_state = #{auditState},</if>
            <if test="state != null">state = #{state},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>

 ycl-server/src/main/resources/mapper/zgyw/CheckTemplateMapper.xml

@@ -29,11 +29,8 @@
        <include refid="selectCheckTemplateVo"/>
        <where>  
            <if test="templateName != null  and templateName != ''"> and template_name like concat('%', #{templateName}, '%')</if>
            <if test="adjustCoefficient != null "> and adjust_coefficient = #{adjustCoefficient}</if>
            <if test="adjustWay != null  and adjustWay != ''"> and adjust_way = #{adjustWay}</if>
            <if test="examineCategory != null "> and examine_category = #{examineCategory}</if>
            <if test="status != null  and status != ''"> and status = #{status}</if>
            <if test="deptId != null  and deptId != ''"> and dept_id = #{deptId}</if>
        </where>
    </select>