添加节点类型、标签等

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

@@ -353,9 +353,70 @@ public class XmTaskWorkloadController {
 		}  
 		m.put("tips", tips);
 		return m;
-	} 
+	}
+
+
+
+	@ApiOperation( value = "",notes=" ")
+	@ApiResponses({
+			@ApiResponse(code = 200,response=XmTaskWorkload.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
+	})
+	@RequestMapping(value="/batchSetSbillIdNull",method=RequestMethod.POST)
+	public Map<String,Object> batchSetSbillIdNull(@RequestBody List<XmTaskWorkload> xmTaskWorkloads) {
+		Map<String,Object> m = new HashMap<>();
+		Tips tips=new Tips("成功移出结算单");
+		try{
+
+			List<String> ids= xmTaskWorkloads.stream().map(i->i.getId()).collect(Collectors.toList());
+			if(ids==null || ids.size()==0){
+				return ResponseHelper.failed("ids-0","工时变化ids不能为空");
+			}
+
+			User user= LoginUtils.getCurrentUserInfo();
+
+			List<XmTaskWorkload> list=this.xmTaskWorkloadService.selectListByIds(ids);
+			if(list.size()==0){
+				return ResponseHelper.failed("data-0","工时明细不存在");
+			}
+
+			List<XmTaskSbill> xmTaskSbills=this.xmTaskSbillService.selectListByIds(list.stream().map(i->i.getSbillId()).collect(Collectors.toSet()).stream().collect(Collectors.toList()));
+			Map<String,XmTaskSbill> canBillMap=new HashMap<>();
+			for (XmTaskSbill xmTaskSbill : xmTaskSbills) {
+				if(user.getUserid().equals(xmTaskSbill.getCuserid())){
+					if("0".equals(xmTaskSbill.getStatus())){
+						canBillMap.put(xmTaskSbill.getId(),xmTaskSbill);
+					}
+				}
+			}
+			List<XmTaskWorkload> canChanges=list.stream().filter(i->canBillMap.containsKey(i.getSbillId())).collect(Collectors.toList());
+			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){
+				msgs.add("成功将"+canChanges.size()+"条工时移出结算单");
+			}
 
+			if(noChanges.size()>0){
+				msgs.add("有"+noChanges.size()+"条工时对应的结算单不是待提交状态，不允许更改");
+			}
+			if(canChanges.size()>0){
+				tips.setOkMsg(msgs.stream().collect(Collectors.joining()));
+			}else{
+				tips.setFailureMsg(msgs.stream().collect(Collectors.joining()));
+			}
 
+		}catch (BizException e) {
+			tips=e.getTips();
+			logger.error("",e);
+		}catch (Exception e) {
+			tips.setFailureMsg(e.getMessage());
+			logger.error("",e);
+		}
+		m.put("tips", tips);
+		return m;
+	}
 
 	@ApiOperation( value = "",notes=" ")
 	@ApiResponses({

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

@@ -47,7 +47,7 @@ public class XmTaskSbillService extends BaseService {
 		XmTaskWorkload xmTaskWorkload = new XmTaskWorkload();
 		xmTaskWorkload.setSbillId(xmTaskSbill.getId());
 		xmTaskWorkload.setSstatus("1");//标记为待提交结算
-		xmTaskWorkloadService.update("updateSomeFieldByWhere",xmTaskWorkload);
+		xmTaskWorkloadService.updateStatusBySbillIdBySbillDel(xmTaskWorkload);
 	}
 
 	/**

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

@@ -62,5 +62,13 @@ public class XmTaskWorkloadService extends BaseService {
 	public List<Map<String,Object>> listTaskWorkloadBySbillIdGroupByUseridAndTaskId(String sbillId) {
 		return this.selectList("listTaskWorkloadBySbillIdGroupByUseridAndTaskId",sbillId);
 	}
+
+	public void updateStatusBySbillIdBySbillDel(XmTaskWorkload xmTaskWorkload) {
+		super.update("updateStatusBySbillIdBySbillDel",xmTaskWorkload);
+	}
+
+	public void batchSetSbillIdNull(List<String> ids) {
+		super.update("batchSetSbillIdNull",ids);
+	}
 }
 

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskWorkloadMapper.xml

@@ -38,7 +38,17 @@
 			AND res.biz_date BETWEEN #{startBizDate} AND #{endBizDate}
 		</if>
     </sql>
-
+	<update id="updateStatusBySbillIdBySbillDel" parameterType="com.xm.core.entity.XmTaskWorkload">
+		update xm_task_workload res set sbill_id=null
+		where res.sbill_id=#{sbillId}
+	</update>
+	<update id="batchSetSbillIdNull" parameterType="List">
+		update xm_task_workload res set sbill_id=null
+		where res.id in
+		<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
+			#{item}
+		</foreach>
+	</update>
 	<!-- 根据条件修改若干条记录 -->
 	<update id="batchEditSbillId" parameterType="HashMap">
 		update  xm_task_workload res