From b07d4b83387e670ad2d1fc921037fb24fe4e836b Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 18 八月 2023 19:15:21 +0800
Subject: [PATCH] #产出计算
---
server/src/main/java/doumeemes/service/business/impl/CategoryServiceImpl.java | 24 +++++++++++
server/src/main/java/doumeemes/dao/ext/vo/SalaryStatisticsListVO.java | 14 +++---
server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java | 3 +
server/src/main/java/doumeemes/dao/ext/vo/UserSalaryListVO.java | 4 +-
server/src/main/resources/mappers/WorkorderExtMapper.xml | 6 ++-
server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java | 2
server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java | 3 +
server/src/main/java/doumeemes/service/business/CategoryService.java | 12 +++++-
server/src/main/java/doumeemes/api/ext/CategoryExtController.java | 22 +++++++++--
server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java | 6 +--
10 files changed, 72 insertions(+), 24 deletions(-)
diff --git a/server/src/main/java/doumeemes/api/ext/CategoryExtController.java b/server/src/main/java/doumeemes/api/ext/CategoryExtController.java
index ebb69c3..3993e09 100644
--- a/server/src/main/java/doumeemes/api/ext/CategoryExtController.java
+++ b/server/src/main/java/doumeemes/api/ext/CategoryExtController.java
@@ -8,9 +8,11 @@
import doumeemes.core.model.PageWrap;
import doumeemes.core.utils.Constants;
import doumeemes.dao.business.model.Category;
+import doumeemes.dao.business.model.CategoryUnion;
import doumeemes.dao.ext.dto.QueryCategoryExtDTO;
import doumeemes.dao.ext.vo.CategoryExtListVO;
import doumeemes.service.business.CategoryService;
+import doumeemes.service.business.CategoryUnionService;
import doumeemes.service.ext.CategoryExtService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -45,6 +47,9 @@
@Autowired
private CategoryService categoryService;
+ @Autowired
+ private CategoryUnionService categoryUnionService;
+
@PreventRepeat
@ApiOperation("鏂板缓")
@@ -74,7 +79,17 @@
category.setCreateTime(new Date());
category.setCreateUser(getLoginUser().getId());
category.setRootDepartId(getLoginUser().getRootDepartment().getId());
- int r = categoryService.create(category);
+ int r = categoryService.create(category);
+ CategoryUnion categoryUnion = new CategoryUnion();
+ categoryUnion.setDeleted(Constants.ZERO);
+ categoryUnion.setCreateUser(getLoginUser().getId());
+ categoryUnion.setCreateTime(new Date());
+ categoryUnion.setUpdateUser(getLoginUser().getId());
+ categoryUnion.setUpdateTime(new Date());
+ categoryUnion.setRemark("");
+ categoryUnion.setRootDepartId(getLoginUser().getRootDepartment().getId());
+ categoryUnion.setCateBigId(category.getId());
+ categoryUnionService.create(categoryUnion);
categoryExtService.loadCom(getLoginUser().getCompany());
return ApiResponse.success(r );
}
@@ -84,9 +99,8 @@
@GetMapping("/delete/{id}")
@RequiresPermissions("ext:categoryext:delete")
public ApiResponse deleteById(@PathVariable Integer id) {
- Category category = categoryService.findById(Integer.valueOf(id));
- category.setDeleted(Constants.ONE);
- categoryService.updateById(category);
+
+ categoryService.deleteCategory(id);
return ApiResponse.success(null);
}
diff --git a/server/src/main/java/doumeemes/dao/ext/vo/SalaryStatisticsListVO.java b/server/src/main/java/doumeemes/dao/ext/vo/SalaryStatisticsListVO.java
index 792ddfb..79f4038 100644
--- a/server/src/main/java/doumeemes/dao/ext/vo/SalaryStatisticsListVO.java
+++ b/server/src/main/java/doumeemes/dao/ext/vo/SalaryStatisticsListVO.java
@@ -28,20 +28,20 @@
@ExcelColumn(name="鐢熶骇浜哄憳濮撳悕")
private String userName;
@ApiModelProperty(value = "鎵�灞為儴闂ㄧ紪鐮�", example = "1",hidden = true)
- @ExcelColumn(name="鎵�灞為儴闂ㄧ紪鐮�")
+// @ExcelColumn(name="鎵�灞為儴闂ㄧ紪鐮�")
private Integer departId;
@ApiModelProperty(value = "鎵�灞為儴闂ㄥ悕绉�",hidden = true)
@ExcelColumn(name="鎵�灞為儴闂ㄥ悕绉�")
private String departName;
- @ApiModelProperty(value = "璁′欢宸ヨ祫锛堝垎锛�", example = "1")
- @ExcelColumn(name="璁′欢宸ヨ祫锛堝垎锛�")
+ @ApiModelProperty(value = "璁′欢宸ヨ祫锛堝厓锛�", example = "1")
+ @ExcelColumn(name="璁′欢宸ヨ祫锛堝厓锛�")
private BigDecimal jijianSalary;
- @ApiModelProperty(value = "璁℃椂宸ヨ祫锛堝垎锛�", example = "1")
- @ExcelColumn(name="璁℃椂宸ヨ祫锛堝垎锛�")
+ @ApiModelProperty(value = "璁℃椂宸ヨ祫锛堝厓锛�", example = "1")
+ @ExcelColumn(name="璁℃椂宸ヨ祫锛堝厓锛�")
private BigDecimal jishiSalary;
- @ApiModelProperty(value = "灏忚宸ヨ祫锛堝垎锛�", example = "1")
- @ExcelColumn(name="灏忚宸ヨ祫锛堝垎锛�")
+ @ApiModelProperty(value = "灏忚宸ヨ祫锛堝厓锛�", example = "1")
+ @ExcelColumn(name="灏忚宸ヨ祫锛堝厓锛�")
private BigDecimal totalSalary;
@ApiModelProperty(value = "鎶ュ伐鎬诲崟鏁�,涓嶅寘鍚伐璧勪负0鐨�", example = "1")
@ExcelColumn(name="鎶ュ伐鎬诲崟鏁�")
diff --git a/server/src/main/java/doumeemes/dao/ext/vo/UserSalaryListVO.java b/server/src/main/java/doumeemes/dao/ext/vo/UserSalaryListVO.java
index 5ca376d..f2835bb 100644
--- a/server/src/main/java/doumeemes/dao/ext/vo/UserSalaryListVO.java
+++ b/server/src/main/java/doumeemes/dao/ext/vo/UserSalaryListVO.java
@@ -26,7 +26,7 @@
@ExcelColumn(name="鐢熶骇浜哄憳濮撳悕")
private String userName;
@ApiModelProperty(value = "鎵�灞為儴闂ㄧ紪鐮�", example = "1",hidden = true)
- @ExcelColumn(name="鎵�灞為儴闂ㄧ紪鐮�")
+// @ExcelColumn(name="鎵�灞為儴闂ㄧ紪鐮�")
private Integer departId;
@ApiModelProperty(value = "鎵�灞為儴闂ㄥ悕绉�",hidden = true)
@@ -39,7 +39,7 @@
@ExcelColumn(name="鐗╂枡鍚嶇О")
private String materialName;
@ApiModelProperty(value = "鐗╂枡涓婚敭", example = "1")
- @ExcelColumn(name="鐗╂枡涓婚敭")
+// @ExcelColumn(name="鐗╂枡涓婚敭")
private Integer materialId;
@ApiModelProperty(value = "宸ュ崟缂栫爜", example = "1")
@ExcelColumn(name="宸ュ崟缂栫爜")
diff --git a/server/src/main/java/doumeemes/service/business/CategoryService.java b/server/src/main/java/doumeemes/service/business/CategoryService.java
index 6efe581..7e0dd5a 100644
--- a/server/src/main/java/doumeemes/service/business/CategoryService.java
+++ b/server/src/main/java/doumeemes/service/business/CategoryService.java
@@ -20,7 +20,7 @@
/**
* 鍒涘缓
- *
+ *
* @param category 瀹炰綋瀵硅薄
* @return Integer
*/
@@ -39,6 +39,14 @@
* @param category 瀹炰綋瀵硅薄
*/
void delete(Category category);
+
+
+ /**
+ * 鍒犻櫎
+ *
+ * @param id 瀹炰綋瀵硅薄
+ */
+ void deleteCategory(Integer id);
/**
* 鎵归噺涓婚敭鍒犻櫎
@@ -84,7 +92,7 @@
* @return List<Category>
*/
List<Category> findList(Category category);
-
+
/**
* 鍒嗛〉鏌ヨ
*
diff --git a/server/src/main/java/doumeemes/service/business/impl/CategoryServiceImpl.java b/server/src/main/java/doumeemes/service/business/impl/CategoryServiceImpl.java
index e3e7b4b..bca959f 100644
--- a/server/src/main/java/doumeemes/service/business/impl/CategoryServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/CategoryServiceImpl.java
@@ -15,7 +15,9 @@
import doumeemes.core.utils.excel.EasyExcelUtil;
import doumeemes.core.utils.redis.RedisUtil;
import doumeemes.dao.business.CategoryMapper;
+import doumeemes.dao.business.CategoryUnionMapper;
import doumeemes.dao.business.model.Category;
+import doumeemes.dao.business.model.CategoryUnion;
import doumeemes.service.business.CategoryService;
import doumeemes.service.ext.CategoryExtService;
import org.apache.commons.lang3.StringUtils;
@@ -48,6 +50,9 @@
@Autowired
private RedisTemplate<String, Object> redisTemplate;
+ @Autowired
+ private CategoryUnionMapper categoryUnionMapper;
+
@Override
public synchronized String getNextCode(Integer comId ){
String prefix = "FL-" + DateUtil.getDate(new Date(),"yyyyMMdd") +"-";
@@ -75,6 +80,23 @@
UpdateWrapper<Category> deleteWrapper = new UpdateWrapper<>(category);
categoryMapper.delete(deleteWrapper);
}
+
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ @Override
+ public void deleteCategory(Integer id) {
+ Category category = this.findById(Integer.valueOf(id));
+ category.setDeleted(Constants.ONE);
+ updateById(category);
+
+ UpdateWrapper<CategoryUnion> wrapper = new UpdateWrapper<>();
+ wrapper.lambda()
+ .eq(CategoryUnion::getCateBigId,id)
+ .isNull(CategoryUnion::getCateMiddleId)
+ .isNull(CategoryUnion::getCateSmallId)
+ .set(CategoryUnion::getDeleted,Constants.ONE);
+ categoryUnionMapper.update(null,wrapper);
+ }
+
@Override
public void deleteByIdInBatch(List<Integer> ids) {
@@ -119,7 +141,7 @@
QueryWrapper<Category> wrapper = new QueryWrapper<>(category);
return categoryMapper.selectList(wrapper);
}
-
+
@Override
public PageData<Category> findPage(PageWrap<Category> pageWrap) {
IPage<Category> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
diff --git a/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java b/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
index 52478da..b97cf17 100644
--- a/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
@@ -227,7 +227,7 @@
proceduresWrapper.lambda()
.eq(Procedures::getName,salaryParamImportDTO.getProcedureName())
.eq(Procedures::getRootDepartId,department.getRootId())
- .eq(Procedures::getOrgId,department.getId())
+// .eq(Procedures::getOrgId,department.getId())
.last("limit 1");
Procedures procedures = proceduresMapper.selectOne(proceduresWrapper);
if (Objects.isNull(procedures)){
diff --git a/server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java
index 8874489..64c293b 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java
@@ -37,10 +37,7 @@
import java.math.BigDecimal;
import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
/**
* 鐢熶骇璁″垝Service瀹炵幇
@@ -167,6 +164,7 @@
initPlanStatisticInfo(t);
PlansExtListH5VO plan = new PlansExtListH5VO();
BeanUtils.copyProperties(t,plan);
+// plan.setDoneNum();
plan.setWorkorderList(workorderExtService.findByPlanId(plan,true));
return plan;
}
diff --git a/server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java
index bda445e..9954f48 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java
@@ -370,7 +370,7 @@
rParam.setPlanId(pageWrap.getId());
rParam.setDeleted(Constants.ZERO);
//宸插畬宸ユ暟閲�
- plan.setDoneNum(0);
+// plan.setDoneNum(0);
//宸插垎閰嶆暟閲�
plan.setDistributNum(0);
//鏌ヨ鍏ㄩ儴鎶曟枡鍜屼骇鍑�
@@ -413,6 +413,7 @@
tModle.setProUserName(w.getProUserName());
tModle.setProUserName(w.getProUserName());
tModle.setCreateUser(w.getCreateUser());
+ tModle.setCreateUserName(w.getCreateUserName());
if(w.getProUserId()!=null){
//鏌ヨ鐝粍淇℃伅
QueryCompanyUserExtDTO queryCompanyUserExtDTO = new QueryCompanyUserExtDTO();
diff --git a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
index 75f7e0d..496fa5e 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
@@ -157,6 +157,9 @@
//鏌ヨ鐢熶骇浜哄憳濮撳悕
// model.setUserName(initProUser(user,model.getUserId(),allDepartList));
model.setUserInfo(initProUser(user,model.getUserId(),allDepartList));
+ model.setJijianSalary(model.getJijianSalary().divide(new BigDecimal("100"),2,BigDecimal.ROUND_HALF_UP));
+ model.setJishiSalary(model.getJishiSalary().divide(new BigDecimal("100"),2,BigDecimal.ROUND_HALF_UP));
+ model.setTotalSalary(model.getTotalSalary().divide(new BigDecimal("100"),2,BigDecimal.ROUND_HALF_UP));
}
}
return PageData.from(new PageInfo<>(result));
diff --git a/server/src/main/resources/mappers/WorkorderExtMapper.xml b/server/src/main/resources/mappers/WorkorderExtMapper.xml
index e583b32..220473e 100644
--- a/server/src/main/resources/mappers/WorkorderExtMapper.xml
+++ b/server/src/main/resources/mappers/WorkorderExtMapper.xml
@@ -243,7 +243,7 @@
</select>
<!-- 绠＄悊椤甸潰鏌ヨ -->
<select id="sumOrderNum" parameterType="doumeemes.dao.ext.dto.QueryWorkorderExtDTO" resultType="java.lang.Integer">
- SELECT sum(`a`.num)
+ SELECT sum(`a`.id)
FROM `workorder` `a`
<where>
<if test="id != null">
@@ -469,7 +469,8 @@
`pgmodel`.`GROUP_ID` AS PGMODEL_GROUP_ID,
`pgmodel`.`SERIAL_NUM` AS PGMODEL_SERIAL_NUM,
p.name as procedureName,
- u.realname as proUserName,
+ u.realname as proUserName,
+ uc.realname as createUserName,
(select sum(ifnull(num,0)) from workorder_record r where r.deleted=0 and r.type=1 and r.workorder_id=a.id) as proNum
<if test="checkTouliao!=null and checkTouliao==1">
,(select r.id from workorder_record r where r.deleted=0 and r.type=0 and r.workorder_id=a.id limit 1) as touliaoId
@@ -487,6 +488,7 @@
LEFT JOIN `device` `pgmodel` ON a.PRO_GROUP_ID=pgmodel.ID
LEFT JOIN `procedures` `p` ON a.`PROCEDURE_ID`=p.ID
LEFT JOIN `system_user` `u` ON `a`.`PRO_USER_ID`=u.ID
+ LEFT JOIN `system_user` `uc` ON `a`.`CREATE_USER`=uc.ID
<where>
<if test="id != null">
AND `a`.`ID` = #{id}
--
Gitblit v1.9.3