添加节点类型、标签等

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

@@ -96,8 +96,40 @@ 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:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
+	})
+	@RequestMapping(value="/listProjectWorkloadSetDay",method=RequestMethod.GET)
+	public Map<String,Object> listProjectWorkloadSetDay( @RequestParam Map<String,Object> xmTaskWorkload){
+		Map<String,Object> m = new HashMap<>();
+		Tips tips=new Tips("查询成功");
+		PageUtils.startPage(xmTaskWorkload);
+		List<Map<String,Object>>	xmTaskWorkloadList = xmTaskWorkloadService.listProjectWorkloadSetDay(xmTaskWorkload);	//列出XmTaskWorkload列表
+		PageUtils.responePage(m, xmTaskWorkloadList);
+		m.put("data",xmTaskWorkloadList);
+
+		m.put("tips", tips);
+		return m;
+	}
+
+
+	@ApiOperation( value = "查询项目每月登记工时情况",notes=" ")
+	@ApiResponses({
+			@ApiResponse(code = 200,response=XmTaskWorkload.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
+	})
+	@RequestMapping(value="/listProjectWorkloadSetMonth",method=RequestMethod.GET)
+	public Map<String,Object> listProjectWorkloadSetMonth( @RequestParam Map<String,Object> xmTaskWorkload){
+		Map<String,Object> m = new HashMap<>();
+		Tips tips=new Tips("查询成功");
+		PageUtils.startPage(xmTaskWorkload);
+		List<Map<String,Object>>	xmTaskWorkloadList = xmTaskWorkloadService.listProjectWorkloadSetMonth(xmTaskWorkload);	//列出XmTaskWorkload列表
+		PageUtils.responePage(m, xmTaskWorkloadList);
+		m.put("data",xmTaskWorkloadList);
+
+		m.put("tips", tips);
+		return m;
+	}
 
 	@ApiOperation( value = "新增一条工时登记表信息",notes=" ")
 	@ApiResponses({
@@ -429,8 +461,8 @@ public class XmTaskWorkloadController {
 				}
 			}
 			if(StringUtils.hasText(wstatus)){
-				if(!"0".equals(wstatus) && !"1".equals(wstatus) && !"2".equals(wstatus)){
-					return ResponseHelper.failed("wstatus-not-012","工时状态不正确");
+				if(!"0".equals(wstatus) && !"1".equals(wstatus) ){
+					return ResponseHelper.failed("wstatus-not-01","工时状态不正确");
 				}
 			}
 			if("1".equals(wstatus)){
@@ -443,10 +475,6 @@ public class XmTaskWorkloadController {
 				xmTaskWorkloadMap.put("sstatus",sstatus);
 			}
 
-			if("2".equals(wstatus)){
-				sstatus="0";
-				xmTaskWorkloadMap.put("sstatus",sstatus);
-			}
 			List<XmTaskWorkload> canChanges=new ArrayList<>();
 			List<XmTaskWorkload> sstatusNot01=new ArrayList<>();
 			for (XmTaskWorkload xmTaskWorkload : xmTaskWorkloadsDb) {

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

@@ -53,5 +53,14 @@ public class XmTaskWorkloadService extends BaseService {
 	public void editSomeFields(Map<String, Object> xmTaskWorkloadMap) {
 		super.update("editSomeFields",xmTaskWorkloadMap);
 	}
+
+	public List<Map<String, Object>> listProjectWorkloadSetDay(Map<String, Object> xmTaskWorkload) {
+		return super.selectList("listProjectWorkloadSetDay",xmTaskWorkload);
+	}
+	public List<Map<String, Object>> listProjectWorkloadSetMonth(Map<String, Object> xmTaskWorkload) {
+		return super.selectList("listProjectWorkloadSetMonth",xmTaskWorkload);
+	}
+
+
 }
 

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

@@ -33,6 +33,10 @@
 		<if test="startTime!=null and startTime !=''">
 			AND res.ctime BETWEEN #{startTime} AND #{endTime}
 		</if>
+
+		<if test="startBizDate!=null and startBizDate !=''">
+			AND res.biz_date BETWEEN #{startBizDate} AND #{endBizDate}
+		</if>
     </sql>
 
 	<!-- 根据条件修改若干条记录 -->
@@ -60,6 +64,48 @@
 			#{item}
 		</foreach>
 	</update>
+
+	<select id="listProjectWorkloadSetDay" parameterType="HashMap" resultType="HashMap">
+		select
+		res.biz_date,res.project_id,
+		sum(ifnull(res.workload,0)) as workload,
+		sum(if(res.wstatus='0',ifnull(res.workload,0),0)) as to_confirm_workload,
+		sum(if(res.wstatus='1',ifnull(res.workload,0),0)) as had_confirm_workload,
+		sum(if(res.sstatus='0',ifnull(res.workload,0),0)) as not_need_set_workload,
+		sum(if(res.sstatus='1',ifnull(res.sworkload,0),0)) as to_set_sworkload,
+		sum(if(res.sstatus='2',ifnull(res.sworkload,0),0)) as had_commit_sworkload,
+		sum(if(res.sstatus='3',ifnull(res.sworkload,0),0)) as had_agree_sworkload,
+		sum(if(res.sstatus='4',ifnull(res.sworkload,0),0)) as had_set_sworkload,
+		count(distinct res.userid) as user_num
+		from xm_task_workload res
+		<where>
+			<include refid="whereForMap"/>
+			<include refid="where"/>
+		</where>
+		group by res.project_id,res.biz_date
+		order by res.biz_date asc
+	</select>
+
+	<select id="listProjectWorkloadSetMonth" parameterType="HashMap" resultType="HashMap">
+		select
+		SUBSTRING(res.biz_date, 0,8) as biz_month,res.project_id,
+		sum(ifnull(res.workload,0)) as workload,
+		sum(if(res.wstatus='0',ifnull(res.workload,0),0)) as to_confirm_workload,
+		sum(if(res.wstatus='1',ifnull(res.workload,0),0)) as had_confirm_workload,
+		sum(if(res.sstatus='0',ifnull(res.workload,0),0)) as not_need_set_workload,
+		sum(if(res.sstatus='1',ifnull(res.sworkload,0),0)) as to_set_sworkload,
+		sum(if(res.sstatus='2',ifnull(res.sworkload,0),0)) as had_commit_sworkload,
+		sum(if(res.sstatus='3',ifnull(res.sworkload,0),0)) as had_agree_sworkload,
+		sum(if(res.sstatus='4',ifnull(res.sworkload,0),0)) as had_set_sworkload,
+		count(distinct res.userid) as user_num
+		from xm_task_workload res
+		<where>
+			<include refid="whereForMap"/>
+			<include refid="where"/>
+		</where>
+		group by res.project_id,biz_month
+		order by biz_month asc
+	</select>
 	<!--结束 自定义sql函数区域-->