From 8bee7f64d37cf5af9d45948c196cfe79f69967c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Fri, 22 Apr 2022 02:41:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8A=82=E7=82=B9=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E3=80=81=E6=A0=87=E7=AD=BE=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/ctrl/XmTaskWorkloadController.java   | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java
index 956d131b..24af6773 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java
@@ -89,6 +89,11 @@ public class XmTaskWorkloadController {
 		RequestUtils.transformArray( xmTaskWorkload, "wstatuses");
 		RequestUtils.transformArray( xmTaskWorkload, "sstatuses");
 		PageUtils.startPage(xmTaskWorkload);
+		String taskId= (String) xmTaskWorkload.get("taskId");
+		String sbillId= (String) xmTaskWorkload.get("sbillId");
+		String projectId= (String) xmTaskWorkload.get("projectId");
+		String userid= (String) xmTaskWorkload.get("userid");
+		User user=LoginUtils.getCurrentUserInfo();
 		List<Map<String,Object>>	xmTaskWorkloadList = xmTaskWorkloadService.selectListMapByWhere(xmTaskWorkload);	//列出XmTaskWorkload列表
 		PageUtils.responePage(m, xmTaskWorkloadList);
 		m.put("data",xmTaskWorkloadList);
@@ -140,16 +145,9 @@ public class XmTaskWorkloadController {
 		Map<String,Object> m = new HashMap<>();
 		Tips tips=new Tips("成功新增一条数据");
 		try{
-		    boolean createPk=false;
-			if(!StringUtils.hasText(xmTaskWorkload.getId())) {
-			    createPk=true;
-				xmTaskWorkload.setId(xmTaskWorkloadService.createKey("id"));
-			}
-			if(createPk==false){
-                 if(xmTaskWorkloadService.selectOneObject(xmTaskWorkload) !=null ){
-                    return failed("pk-exists","编号重复，请修改编号再提交");
-                }
-            }
+			User user= LoginUtils.getCurrentUserInfo();
+			xmTaskWorkload.setId(xmTaskWorkloadService.createKey("id"));
+
 			if(!StringUtils.hasText(xmTaskWorkload.getTaskId())) {
 				return failed("taskId-0","请上送任务编号");
 			}
@@ -160,6 +158,14 @@ public class XmTaskWorkloadController {
 			if(xmTaskWorkload.getWorkload().compareTo(BigDecimal.ZERO)==0) {
 				return failed("workload-0","工时不能为0");
 			}
+			XmTaskWorkload xmTaskWorkloadCount=new XmTaskWorkload();
+			//xmTaskWorkloadCount.setUserid(user.getUserid());
+			xmTaskWorkloadCount.setBizDate(xmTaskWorkload.getBizDate());
+			xmTaskWorkloadCount.setTaskId(xmTaskWorkload.getTaskId());
+			long count=this.xmTaskWorkloadService.countByWhere(xmTaskWorkloadCount);
+			if(count>0){
+				return failed("data-1","当前任务今天已经报工");
+			}
 			XmTask xmTaskDb=this.xmTaskService.selectOneObject(new XmTask(xmTaskWorkload.getTaskId()));
 			if(xmTaskDb==null ){
 				return failed("data-0","任务已不存在");
@@ -170,7 +176,7 @@ public class XmTaskWorkloadController {
 			if("3".equals(xmTaskDb.getTaskState())){
 				return failed("taskState-3",xmTaskDb.getName()+"已结算完毕，不能再提交工时");
 			}
-			User user= LoginUtils.getCurrentUserInfo();
+
 			if(!(user.getUserid().equals(xmTaskDb.getCreateUserid())|| user.getUserid().equals(xmTaskDb.getExecutorUserid()))){
 				Tips isCreate=xmGroupService.checkIsAdmOrTeamHeadOrAssByPtype(user,xmTaskDb.getCreateUserid(),xmTaskDb.getPtype(),xmTaskDb.getProductId(),xmTaskDb.getProjectId());
 				if(!isCreate.isOk()){
@@ -392,6 +398,7 @@ public class XmTaskWorkloadController {
 			List<XmTaskWorkload> noChanges=list.stream().filter(i->!canBillMap.containsKey(i.getSbillId())).collect(Collectors.toList());
 			if(canChanges.size()>0){
 				xmTaskWorkloadService.batchSetSbillIdNull(canChanges.stream().map(i->i.getId()).collect(Collectors.toList()));
+
 			}
 			List<String> msgs=new ArrayList<>();
 			if(canChanges.size()>0){