diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkProjectPayment.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkProjectPayment.java index 7f0110d..60863eb 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkProjectPayment.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkProjectPayment.java @@ -84,4 +84,10 @@ public class WrkProjectPayment extends BaseEntity { */ @TableField(value = "remark") private String remark; + + @TableField(exist = false) + private String projectPhone; + + @TableField(exist = false) + private String projectConcat; } diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/EmployeeVO.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/EmployeeVO.java new file mode 100644 index 0000000..f0a238e --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/EmployeeVO.java @@ -0,0 +1,58 @@ +package com.chushang.inspection.project.vo; + +import com.chushang.common.dict.annotation.DictFormat; +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * 项目数据展示 + */ +@Data +public class EmployeeVO { + + private Long projectId; + + /** + * 项目联系人 + * 查询条件 项目联系人 + */ + private String projectConcat; + + /** + * 项目联系人电话 + * 查询条件 项目联系人电话 + */ + private String projectPhone; + /** + * 项目所属部门id + * 查询条件 项目所属部门id 单id + */ + private Long deptId; + /** + * 部门名称 + */ + private String deptName; + /** + * 创建时间 + */ + private LocalDateTime createTime; + /** + * 被派单数量 + */ + private Integer dispatchNum; + /** + * 审核通过数 + */ + private Integer aduitNum; + /** + * 超时数量 + */ + private Integer timeroutNum; + /** + * 新增终端数量 + */ + private Integer terminalNum; + + +} diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/WrkProjectPaymentVO.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/WrkProjectPaymentVO.java index 724206e..0ebaec3 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/WrkProjectPaymentVO.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/WrkProjectPaymentVO.java @@ -56,6 +56,11 @@ public class WrkProjectPaymentVO { * 应汇款金额 */ private BigDecimal contractAmount; + + /** + * 未汇款金额 + */ + private BigDecimal notAmount; /** * 回款日期 */ diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkAuditRule.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkAuditRule.java index 58dc61b..34914c5 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkAuditRule.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkAuditRule.java @@ -37,7 +37,7 @@ public class WrkAuditRule extends BaseEntity { * 状态 */ @TableField(value = "status") - private Integer status; + private boolean status; /** @@ -56,7 +56,7 @@ public class WrkAuditRule extends BaseEntity { * 规则时间 */ @TableField(value = "rule_time") - private LocalDateTime ruleTime; + private String ruleTime; /** diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/vo/WrkAuditRuleDTO.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/vo/WrkAuditRuleDTO.java index b3b146b..e0e2e63 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/vo/WrkAuditRuleDTO.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/vo/WrkAuditRuleDTO.java @@ -24,7 +24,7 @@ public class WrkAuditRuleDTO { * 状态 */ @TableField(value = "status") - private Integer status; + private boolean status; /** @@ -43,7 +43,7 @@ public class WrkAuditRuleDTO { * 规则时间 */ @TableField(value = "rule_time") - private LocalDateTime ruleTime; + private String ruleTime; /** diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectController.java index 51f0d8e..0148ba3 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectController.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectController.java @@ -191,6 +191,16 @@ public class WrkProjectController { return AjaxResult.success("项目数据导出成功, 请在后台任务中查看, 任务id: ["+ projectService.projectDataExport(projectQuery) +"]"); } + /** + * 人工数据 + */ + @GetMapping(value = "/emp/data") +// @RequiresPermissions("inspection:project:info") + public AjaxResult empData(ProjectQuery projectQuery) + { + return AjaxResult.success(projectService.empData(projectQuery)); + } + } diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java index 0ef0dc9..0c89bc6 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java @@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollectionUtil; import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.chushang.common.core.constant.SecurityConstants; import com.chushang.common.core.exception.utils.AssertUtil; @@ -20,10 +21,15 @@ import com.chushang.inspection.project.dto.ContractDTO; import com.chushang.inspection.project.dto.ProjectDTO; import com.chushang.inspection.project.po.WrkProjectContract; import com.chushang.inspection.project.query.ProjectQuery; +import com.chushang.inspection.project.vo.CountVO; +import com.chushang.inspection.project.vo.EmployeeVO; import com.chushang.inspection.project.vo.ProjectVO; import com.chushang.inspection.terminal.service.StoreService; import com.chushang.inspection.terminal.service.TerminalService; +import com.chushang.inspection.terminal.vo.FiveStoreVO; +import com.chushang.inspection.work.po.WrkInfo; import com.chushang.inspection.work.service.WrkInfoService; +import com.chushang.inspection.work.vo.WrkInfoDetailsVO; import com.chushang.oss.entity.dto.UploadBytesDTO; import com.chushang.oss.entity.vo.FileSourceVo; import com.chushang.oss.feign.RemoteOssService; @@ -44,6 +50,7 @@ import javax.annotation.Resource; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Set; @@ -387,4 +394,13 @@ public class WrkProjectService extends ServiceImpl p.setTotalTask(totalTaskMap.getOrDefault(projectId, 0)); }); } + + public PageResult empData(ProjectQuery projectQuery) { + CommonParam commonParam = CommonParam.buildPageRequest(); + Page page = new Page<>(commonParam.getPage(), commonParam.getLimit()); + List employeeVOList1 = wrkInfoService.empData( + projectQuery + ); + return new PageResult(employeeVOList1,page.getTotal(),page.getSize(),page.getCurrent()); + } } diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/mapper/WrkInfoMapper.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/mapper/WrkInfoMapper.java index bf14221..56e2170 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/mapper/WrkInfoMapper.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/mapper/WrkInfoMapper.java @@ -3,7 +3,9 @@ package com.chushang.inspection.work.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chushang.datascope.annotation.DataScope; +import com.chushang.inspection.project.query.ProjectQuery; import com.chushang.inspection.project.vo.CountVO; +import com.chushang.inspection.project.vo.EmployeeVO; import com.chushang.inspection.work.po.WrkInfo; import com.chushang.inspection.work.query.ReviewedQuery; import com.chushang.inspection.work.query.WrkAppQuery; @@ -46,4 +48,6 @@ public interface WrkInfoMapper extends BaseMapper { */ List wrkData(@Param("query") WrkDataQuery wrkDataQuery, Page page); + + List empData(@Param("query") ProjectQuery projectQuery, Page page); } diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/WrkInfoService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/WrkInfoService.java index f0afe82..6b925d6 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/WrkInfoService.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/WrkInfoService.java @@ -3,7 +3,9 @@ package com.chushang.inspection.work.service; import cn.hutool.core.collection.CollectionUtil; import com.chushang.common.mybatis.utils.PageResult; import com.chushang.inspection.project.dto.AuditDTO; +import com.chushang.inspection.project.query.ProjectQuery; import com.chushang.inspection.project.vo.CountVO; +import com.chushang.inspection.project.vo.EmployeeVO; import com.chushang.inspection.terminal.po.Store; import com.chushang.inspection.terminal.po.Terminal; import com.chushang.inspection.terminal.po.TerminalIns; @@ -50,6 +52,7 @@ public interface WrkInfoService extends IService { List countByProjectIds(Set projectIds, Set wrkType); + List empData(ProjectQuery projectQuery); default Map countByProjectIdsMap(Set projectIds, Set wrkType){ List countVOS = countByProjectIds(projectIds, wrkType); if (CollectionUtil.isNotEmpty(countVOS)){ diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoServiceImpl.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoServiceImpl.java index f635954..889af65 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoServiceImpl.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoServiceImpl.java @@ -32,9 +32,11 @@ import com.chushang.datascope.annotation.DataScope; import com.chushang.inspection.ins.GeneratedInsFactory; import com.chushang.inspection.project.dto.AuditDTO; import com.chushang.inspection.project.po.InspectionData; +import com.chushang.inspection.project.query.ProjectQuery; import com.chushang.inspection.project.service.InspectionDataService; import com.chushang.inspection.project.service.PollingTaskService; import com.chushang.inspection.project.vo.CountVO; +import com.chushang.inspection.project.vo.EmployeeVO; import com.chushang.inspection.terminal.po.FiveStore; import com.chushang.inspection.terminal.po.Store; import com.chushang.inspection.terminal.po.Terminal; @@ -787,6 +789,13 @@ public class WrkInfoServiceImpl extends ServiceImpl impl } } + @Override + public List empData(ProjectQuery projectQuery) { + CommonParam commonParam = CommonParam.buildPageRequest(); + Page page = new Page<>(commonParam.getPage(), commonParam.getLimit()); + return baseMapper.empData(projectQuery,page); + } + /** * 计算经纬度 偏差 */ diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkInfoMapper.xml b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkInfoMapper.xml index c4bac25..c34e1db 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkInfoMapper.xml +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkInfoMapper.xml @@ -300,4 +300,16 @@ GROUP BY pt.project_id + + diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectPaymentMapper.xml b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectPaymentMapper.xml index 6465037..fbae816 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectPaymentMapper.xml +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectPaymentMapper.xml @@ -30,7 +30,6 @@ ${query.sqlParam.get('dataScope')} - ORDER BY t.create_time DESC