chujinwang
/
chushangcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

人工数据

This commit is contained in:
Chujinwang 2024-07-29 15:52:41 +08:00
parent 3110b37f5d
commit f8dc29bc1d
12 changed files with 125 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkProjectPayment.java
View File

@ -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;
}

58
chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/EmployeeVO.java Normal file
View File

@ -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;
}

5
chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/WrkProjectPaymentVO.java
View File

@ -56,6 +56,11 @@ public class WrkProjectPaymentVO {
* 应汇款金额
*/
private BigDecimal contractAmount;
/**
* 未汇款金额
*/
private BigDecimal notAmount;
/**
* 回款日期
*/

4
chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkAuditRule.java
View File

@ -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;
/**

4
chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/vo/WrkAuditRuleDTO.java
View File

@ -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;
/**

10
chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectController.java
View File

@ -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));
}
}

14
chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java
View File

@ -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,12 +21,15 @@ 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.query.FiveUnifiedStoreDetailsQuery;
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;
@ -46,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;
@ -373,4 +378,13 @@ public class WrkProjectService extends ServiceImpl<WrkProjectMapper, WrkProject>
p.setTotalTask(totalTaskMap.getOrDefault(projectId, 0));
});
}
public PageResult empData(ProjectQuery projectQuery) {
CommonParam commonParam = CommonParam.buildPageRequest();
Page<WrkInfoDetailsVO> page = new Page<>(commonParam.getPage(), commonParam.getLimit());
List<EmployeeVO> employeeVOList1 = wrkInfoService.empData(
projectQuery
);
return new PageResult(employeeVOList1,page.getTotal(),page.getSize(),page.getCurrent());
}
}

4
chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/mapper/WrkInfoMapper.java
View File

@ -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;
@ -37,4 +39,6 @@ public interface WrkInfoMapper extends BaseMapper<WrkInfo> {
List<CountVO> countByProjectIds(@Param("projectIds") Set<Long> projectIds,
@Param("wrkTypes") Set<Integer> wrkTypes);
List<EmployeeVO> empData(@Param("query") ProjectQuery projectQuery, Page<WrkInfo> page);
}

3
chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/WrkInfoService.java
View File

@ -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;
@ -53,6 +55,7 @@ public interface WrkInfoService extends IService<WrkInfo> {
List<CountVO> countByProjectIds(Set<Long> projectIds, Set<Integer> wrkType);
List<EmployeeVO> empData(ProjectQuery projectQuery);
default Map<Long, Integer> countByProjectIdsMap(Set<Long> projectIds, Set<Integer> wrkType){
List<CountVO> countVOS = countByProjectIds(projectIds, wrkType);
if (CollectionUtil.isNotEmpty(countVOS)){

9
chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoServiceImpl.java
View File

@ -31,9 +31,11 @@ import com.chushang.common.mybatis.utils.WrapperUtils;
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;
@ -669,6 +671,13 @@ public class WrkInfoServiceImpl extends ServiceImpl<WrkInfoMapper, WrkInfo> impl
return baseMapper.countByProjectIds(projectIds, wrkType);
}
@Override
public List<EmployeeVO> empData(ProjectQuery projectQuery) {
CommonParam commonParam = CommonParam.buildPageRequest();
Page<WrkInfo> page = new Page<>(commonParam.getPage(), commonParam.getLimit());
return baseMapper.empData(projectQuery,page);
}
/**
* 计算经纬度 偏差
*/

12
chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkInfoMapper.xml
View File

@ -268,4 +268,16 @@
</if>
GROUP BY wi.project_id
</select>
<select id="empData" resultType="com.chushang.inspection.project.vo.EmployeeVO">
SELECT account_manager as projectConcat ,account_phone as projectPhone,
count(user_id) as dispatchNum,
count(case when wrk_status = 3 then 1 when wrk_status = 4 then 1 end) as aduitNum
FROM wrk_info
where del_state = 0
<if test="query.projectConcat != null and query.projectConcat != ''">
AND project_concat = #{projectConcat}
</if>
GROUP BY user_id
</select>
</mapper>

1
chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectPaymentMapper.xml
View File

@ -30,7 +30,6 @@
<if test="1 == 1">
${query.sqlParam.get('dataScope')}
</if>
ORDER BY t.create_time DESC
</where>
</select>