bug

xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillController.java

@@ -245,10 +245,10 @@ public class XmTaskSbillController {
 			if(sameSbillDetails!=null && sameSbillDetails.size()>0){
 				for (XmTaskSbillDetail detail : sameSbillDetails) {
 					//进行合并操作
-					for (XmWorkload xmTaskWorkload : workloadsDb3) {
-						if(detail.getUserid().equals(xmTaskWorkload.getUserid()) && detail.getTaskId().equals(xmTaskWorkload.getTaskId())){
-							detail.setWorkload(NumberUtil.getBigDecimal(detail.getWorkload(),BigDecimal.ZERO).add(NumberUtil.getBigDecimal(xmTaskWorkload.getWorkload(),BigDecimal.ZERO)));
-							detail.setSworkload(NumberUtil.getBigDecimal(detail.getSworkload(),BigDecimal.ZERO).add(NumberUtil.getBigDecimal(xmTaskWorkload.getWorkload(),BigDecimal.ZERO)));
+					for (XmWorkload xmWorkload : workloadsDb3) {
+						if(detail.getUserid().equals(xmWorkload.getUserid()) && detail.getTaskId().equals(xmWorkload.getTaskId())){
+							detail.setWorkload(NumberUtil.getBigDecimal(detail.getWorkload(),BigDecimal.ZERO).add(NumberUtil.getBigDecimal(xmWorkload.getWorkload(),BigDecimal.ZERO)));
+							detail.setSworkload(NumberUtil.getBigDecimal(detail.getSworkload(),BigDecimal.ZERO).add(NumberUtil.getBigDecimal(xmWorkload.getWorkload(),BigDecimal.ZERO)));
 						}
 					}
 				}
@@ -257,13 +257,13 @@ public class XmTaskSbillController {
 
 			List<XmWorkload> workloadsDb4=workloadsDb3.stream().filter(i->!sameSbillDetails.stream().filter(k->k.getUserid().equals(i.getUserid()) && k.getTaskId().equals(i.getTaskId())).findAny().isPresent()).collect(Collectors.toList());
 			Map<String,XmTaskSbillDetail> detailMap=new HashMap<>();
-			for (XmWorkload xmTaskWorkload : workloadsDb4) {
-				XmTaskSbillDetail detail=detailMap.get(xmTaskWorkload.getUserid()+"-"+xmTaskWorkload.getTaskId());
+			for (XmWorkload xmWorkload : workloadsDb4) {
+				XmTaskSbillDetail detail=detailMap.get(xmWorkload.getUserid()+"-"+xmWorkload.getTaskId());
 				if(detail==null){
 					detail=new XmTaskSbillDetail();
-					BeanUtils.copyProperties(xmTaskWorkload,detail);
-					XmTask xmTask=xmTasksDb2.stream().filter(i->i.getId().equals(xmTaskWorkload.getTaskId())).findAny().get();
-					detail.setSworkload(NumberUtil.getBigDecimal(xmTaskWorkload.getWorkload(),BigDecimal.ZERO));
+					BeanUtils.copyProperties(xmWorkload,detail);
+					XmTask xmTask=xmTasksDb2.stream().filter(i->i.getId().equals(xmWorkload.getTaskId())).findAny().get();
+					detail.setSworkload(NumberUtil.getBigDecimal(xmWorkload.getWorkload(),BigDecimal.ZERO));
 					detail.setId(this.xmTaskSbillDetailService.createKey("id"));
 					detail.setBizDate(DateUtils.getDate("yyyy-MM-dd"));
 					detail.setBizMonth(DateUtils.getDate("yyyy-MM"));
@@ -281,10 +281,10 @@ public class XmTaskSbillController {
 					detail.setOshare(xmTask.getOshare());
 					detail.setTaskName(xmTask.getName());
 					detail.setUniPrice("1".equals(xmTask.getTaskOut())?xmTask.getUniOutPrice():xmTask.getUniInnerPrice());
-					detailMap.put(xmTaskWorkload.getUserid()+"-"+xmTaskWorkload.getTaskId(),detail);
+					detailMap.put(xmWorkload.getUserid()+"-"+xmWorkload.getTaskId(),detail);
 				}else{
-					detail.setWorkload(detail.getWorkload().add(NumberUtil.getBigDecimal(xmTaskWorkload.getWorkload(),BigDecimal.ZERO)));
-					detail.setSworkload(detail.getSworkload().add(NumberUtil.getBigDecimal(xmTaskWorkload.getWorkload(),BigDecimal.ZERO)));
+					detail.setWorkload(detail.getWorkload().add(NumberUtil.getBigDecimal(xmWorkload.getWorkload(),BigDecimal.ZERO)));
+					detail.setSworkload(detail.getSworkload().add(NumberUtil.getBigDecimal(xmWorkload.getWorkload(),BigDecimal.ZERO)));
 				}
 
 			}

xm-core/src/main/java/com/xm/core/entity/XmWorkload.java

@@ -8,7 +8,7 @@ import java.math.BigDecimal;
 
 /**
  * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
- * 实体 XmTaskWorkload所有属性名: <br>
+ * 实体 XmWorkload所有属性名: <br>
  *	"userid","员工编号","username","姓名","ctime","创建日期","taskId","任务编号，任务报工必填","cuserid","创建人编号","bizDate","业务日期yyyy-MM-dd","wstatus","状态0-待确认，1-已确认，2-无效","remark","备注","ttype","任务类型-关联字典taskType","id","主键","stime","结算提交时间","sstatus","结算状态0-无需结算，1-待结算2-已提交3-已通过4-已结算","workload","工时，一个task_id可多次提交，小时","rworkload","剩余工时（同一天取最后日期更新到task表budget_workload中）","cusername","创建人姓名","projectId","归属项目","branchId","项目归属机构","ubranchId","用户归属机构","sbillId","结算单编号","detailId","结算单明细表id","menuId","需求编号，缺陷报工、测试报工、任务报工都可以填","productId","产品编号，能关联到的都填","caseId","测试用例编号(如果是测试执行报工，必填)","planId","测试计划编号(如果是测试执行报工，必填)","bugId","缺陷编号(如果是缺陷报工，必填)","bizType","报工类型1-任务，2-缺陷，3-测试用例设计，4-测试执行";<br>
  * 当前主键(包括多主键):<br>
  *	id;<br>

xm-core/src/main/java/com/xm/core/service/XmWorkloadService.java

@@ -13,9 +13,9 @@ import java.util.Map;
 /**
  * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.<br> 
  * 组织 com  顶级模块 xm 大模块 core 小模块 <br>
- * 实体 XmTaskWorkload 表 xm_workload 当前主键(包括多主键): id; 
+ * 实体 XmWorkload 表 xm_workload 当前主键(包括多主键): id; 
  ***/
-@Service("xm.core.xmTaskWorkloadService")
+@Service("xm.core.xmWorkloadService")
 public class XmWorkloadService extends BaseService {
 	static Logger logger =LoggerFactory.getLogger(XmWorkloadService.class);
 
@@ -24,11 +24,11 @@ public class XmWorkloadService extends BaseService {
 
 
 
-	public List<Map<String, Object>> listProjectWorkloadSetDay(Map<String, Object> xmTaskWorkload) {
-		return super.selectList("listProjectWorkloadSetDay",xmTaskWorkload);
+	public List<Map<String, Object>> listProjectWorkloadSetDay(Map<String, Object> xmWorkload) {
+		return super.selectList("listProjectWorkloadSetDay",xmWorkload);
 	}
-	public List<Map<String, Object>> listProjectWorkloadSetMonth(Map<String, Object> xmTaskWorkload) {
-		return super.selectList("listProjectWorkloadSetMonth",xmTaskWorkload);
+	public List<Map<String, Object>> listProjectWorkloadSetMonth(Map<String, Object> xmWorkload) {
+		return super.selectList("listProjectWorkloadSetMonth",xmWorkload);
 	}
 
 
@@ -42,20 +42,20 @@ public class XmWorkloadService extends BaseService {
 
 
 	@Transactional
-	public void editSomeFieldsWithSbillIds(Map<String, Object> xmTaskWorkloadMap, List<String> sbillIds) {
-		super.editSomeFields(xmTaskWorkloadMap);
+	public void editSomeFieldsWithSbillIds(Map<String, Object> xmWorkloadMap, List<String> sbillIds) {
+		super.editSomeFields(xmWorkloadMap);
 	}
 
 	public void updateStatusBySbillIdByFlowState(String sbillId,String sstatus) {
 		super.update("updateStatusBySbillIdByFlowState",map("sbillId",sbillId,"sstatus",sstatus));
 	}
 
-	public List<Map<String, Object>> ListGroupByTaskIdAndUserid(Map<String, Object> xmTaskWorkload) {
-		return super.selectList("selectListMapGroupByTaskIdAndUserid",xmTaskWorkload);
+	public List<Map<String, Object>> ListGroupByTaskIdAndUserid(Map<String, Object> xmWorkload) {
+		return super.selectList("selectListMapGroupByTaskIdAndUserid",xmWorkload);
 	}
 
-	public List<Map<String, Object>> ListGroupByTaskIdAndUseridToSet(Map<String, Object> xmTaskWorkload) {
-		return super.selectList("ListGroupByTaskIdAndUseridToSet",xmTaskWorkload);
+	public List<Map<String, Object>> ListGroupByTaskIdAndUseridToSet(Map<String, Object> xmWorkload) {
+		return super.selectList("ListGroupByTaskIdAndUseridToSet",xmWorkload);
 	}
 
     public void updateStatusAfterJoinSbill(Map<String,Object> details) {