From 35ddd989b73d815777055bcdf05118d6cdd892e6 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 13 九月 2022 11:18:40 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/ItemController.java | 129 ++++++++++++++++++++++++++++++++++--------
1 files changed, 103 insertions(+), 26 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
index e783404..d8f827a 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
@@ -15,16 +15,11 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import zy.cloud.wms.common.web.BaseController;
-import zy.cloud.wms.manager.entity.Cstmr;
-import zy.cloud.wms.manager.entity.Item;
-import zy.cloud.wms.manager.entity.ProjectPlan;
-import zy.cloud.wms.manager.entity.ProjectType;
-import zy.cloud.wms.manager.service.CstmrService;
-import zy.cloud.wms.manager.service.ItemService;
-import zy.cloud.wms.manager.service.ProjectPlanService;
-import zy.cloud.wms.manager.service.ProjectTypeService;
+import zy.cloud.wms.manager.entity.*;
+import zy.cloud.wms.manager.service.*;
import java.text.SimpleDateFormat;
+import java.time.LocalDate;
import java.util.*;
@RestController
@@ -34,6 +29,12 @@
private ItemService itemService;
@Autowired
private ProjectPlanService planService;
+ @Autowired
+ private FlowStatusService flowStatusService;
+ @Autowired
+ private CstmrService cstmrService;
+ @Autowired
+ private ProjectStatusService projectStatusService;
@RequestMapping(value = "/item/{id}/auth")
@ManagerAuth
@@ -47,11 +48,13 @@
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
+ @RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
EntityWrapper<Item> wrapper = new EntityWrapper<>();
HashSet<String> excludeField = new HashSet<>();
- allLike(Item.class,excludeField,wrapper, (String) param.get("id"));
+ allLike(Item.class, param.keySet(), wrapper, condition);
+// allLike(Item.class,excludeField,wrapper, (String) param.get("id"));
excludeTrash(param);
convert(param, wrapper);
hostEq(wrapper);
@@ -110,10 +113,14 @@
@RequestMapping(value = "/item/add/auth")
@ManagerAuth
public R add(Item item) {
+ /**
+ * 鎺х
+ */
if (Cools.isEmpty(item)) {
return R.error("鍙傛暟涓虹┖,璇疯仈绯荤鐞嗗憳");
}
+
//item.setType("1");
// if (!item.getType().equals("1")) {
// throw new CoolException("鐩墠浠呮敮鎸侀泦鎴愰」鐩�");
@@ -123,24 +130,32 @@
if (!Cools.isEmpty(name)) {
throw new CoolException("涓嶅彲鏈夐噸澶嶉」鐩悕");
}
- if (item.getRealMonth() < 0){
- throw new CoolException("瀹炴柦鍛ㄦ湡涓嶅彲涓鸿礋鏁�");
+// if (item.getRealMonth() < 0){
+// throw new CoolException("瀹炴柦鍛ㄦ湡涓嶅彲涓鸿礋鏁�");
+// }
+ if (Cools.isEmpty(item.getCstmrUuid())) {
+ throw new CoolException("璇烽�夋嫨瀹㈡埛");
}
-
- item.setHostId(getHostId());
+ Cstmr cstmr = cstmrService.selectOne(new EntityWrapper<Cstmr>()
+ .eq("id",Long.parseLong(item.getCstmrUuid())));
+ if (Cools.isEmpty(cstmr)) {
+ throw new CoolException("鎵句笉鍒拌瀹㈡埛,璇锋鏌�");
+ }
+ item.setCustMan(cstmr.getName());
+ item.setCustMobile(cstmr.getTel());
+ item.setCustAdress(cstmr.getAddr());
+ if (Cools.isEmpty(item.getHostId()) || item.getHostId() == 0){
+ item.setHostId(1L);
+ }else {
+ item.setHostId(getHostId());
+ }
item.setCreateBy(getUserId());
item.setCreateTime(new Date());
item.setStatus(1);
item.setUpdateBy(getUserId());
item.setUpdateTime(new Date());
- if(item.getPlandeAmt()!=null && item.getRealdeAmt()!=null){
- item.setExcessAmount(item.getRealdeAmt()-item.getPlandeAmt());
- }
- if(item.getPlandeDate()!=null && item.getRealinDate()!=null){
- Integer days = (int) ((item.getRealinDate().getTime() - item.getPlandeDate().getTime()) / (1000*3600*24));
- item.setExcessTime(days);
- }
-
+ Long span = (item.getEndTime().getTime() - item.getStartTime().getTime()) / 1000 / 60 / 60 / 24;
+ item.setRealMonth(Math.toIntExact(span));
itemService.insertAll(item);
return R.ok();
}
@@ -153,6 +168,7 @@
if (Cools.isEmpty(item)) {
return R.error("鍙傛暟涓虹┖,璇疯仈绯荤鐞嗗憳");
}
+
// item.setType("1");
// if (!item.getType().equals("1")) {
// throw new CoolException("鐩墠浠呮敮鎸侀泦鎴愰」鐩�");
@@ -161,11 +177,26 @@
// if (item.getRealMonth() < 0){
// throw new CoolException("瀹炴柦鍛ㄦ湡涓嶅彲涓鸿礋鏁�");
// }
- if(!(newitem.getStartTime()==null || newitem.getEndTime()==null || newitem.getRealStartTime()==null || newitem.getRealEndTime()==null)){
- item.setStartTime(newitem.getStartTime());
- item.setEndTime(newitem.getEndTime());
- item.setRealEndTime(newitem.getRealEndTime());
- item.setRealStartTime(newitem.getRealStartTime());
+
+
+ //鈫撯啌鈫撳啓杩欐浠ｇ爜鐨勭湡璇ユ娊澶у槾宸村瓙
+// if(!(newitem.getStartTime()==null || newitem.getEndTime()==null || newitem.getRealStartTime()==null || newitem.getRealEndTime()==null)){
+// item.setStartTime(newitem.getStartTime());
+// item.setEndTime(newitem.getEndTime());
+// item.setRealEndTime(newitem.getRealEndTime());
+// item.setRealStartTime(newitem.getRealStartTime());
+// }
+
+
+ //瓒呭嚭杩愯垂
+ if(item.getPlandeAmt()!=null && item.getRealdeAmt()!=null){
+ item.setExcessAmount(item.getRealdeAmt()-item.getPlandeAmt());
+ }
+ //瓒呭嚭澶╂暟
+ if(item.getRealinDate()!=null && item.getPlaninDate()!=null){
+ Double days = (double) ((item.getRealinDate().getTime() - item.getPlaninDate().getTime()) / (1000*3600*24));
+ Integer day= (int) Math.ceil(days);
+ item.setExcessTime(day);
}
item.setUpdateBy(getUserId());
item.setUpdateTime(new Date());
@@ -237,4 +268,50 @@
return R.ok();
}
+ /**
+ * 鍒濆鍖栫敓鎴愰」鐩妭鐐�
+ * @param param
+ * @return
+ */
+ @RequestMapping(value = "/item/initPlan/auth")
+ @ManagerAuth
+ public R initPlan(@RequestParam("id") String param){
+ if (param != null){
+ List<ProjectPlan> projectPlans = planService.selectList(new EntityWrapper<ProjectPlan>().eq("item_id",param));
+ if(!Cools.isEmpty(projectPlans) && projectPlans.size()>0){
+ return R.error("璇ラ」鐩凡鏈夎妭鐐硅鍒�");
+ }
+ List<FlowStatus> flowStatuses = flowStatusService.selectList(new EntityWrapper<FlowStatus>());
+ if(!Cools.isEmpty(flowStatuses) && flowStatuses.size()>0){
+ for(FlowStatus flowStatus : flowStatuses){
+ ProjectPlan projectPlan = new ProjectPlan();
+ projectPlan.setItemId(Long.parseLong(param));
+ projectPlan.setWeightNum(flowStatus.getWeightNum());
+ projectPlan.setFlowId(flowStatus.getId());
+ planService.insert(projectPlan);
+ }
+ } else {
+ return R.error("椤圭洰璁″垝鑺傜偣鍩虹鏁版嵁涓虹┖");
+ }
+ } else {
+ return R.error("椤圭洰鍙傛暟閿欒");
+ }
+
+ return R.ok();
+ }
+ @RequestMapping(value = "/progressRate/auth")
+ @ManagerAuth
+ public R queryProgressRate(String condition) {
+ List<Map<String, Object>> result = new ArrayList<>();
+ List<ProjectStatus> projectStatuses = projectStatusService.selectList(null);
+ for (ProjectStatus projectStatus : projectStatuses) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", projectStatus.getId());
+ map.put("value", projectStatus.getStatusName());
+ result.add(map);
+ }
+
+ return R.ok(result);
+ }
+
}
--
Gitblit v1.9.1