end7less
/
program_xm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

重新生成工时表

master
陈裕财 4 years ago
parent
fc90c6da39
commit
89c01d87c2
3 changed files with 105 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 64
      xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillDetailController.java
  2. 13
      xm-core/src/main/java/com/xm/core/service/XmTaskSbillDetailService.java
  3. 28
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillDetailMapper.xml

64
xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillDetailController.java
View File

@ -71,6 +71,8 @@ public class XmTaskSbillDetailController {
Tips tips=new Tips("查询成功");
RequestUtils.transformArray(xmTaskSbillDetail, "ids");
PageUtils.startPage(xmTaskSbillDetail);
User user=LoginUtils.getCurrentUserInfo();
xmTaskSbillDetail.put("branchId",user.getBranchId());
List<Map<String,Object>> xmTaskSbillDetailList = xmTaskSbillDetailService.selectListMapByWhere(xmTaskSbillDetail); //列出XmTaskSbillDetail列表
PageUtils.responePage(m, xmTaskSbillDetailList);
m.put("data",xmTaskSbillDetailList);
@ -78,9 +80,69 @@ public class XmTaskSbillDetailController {
m.put("tips", tips);
return m;
}
@ApiOperation( value = "查询个人支出费用按月分布报表",notes=" ")
@ApiResponses({
@ApiResponse(code = 200,response=XmTaskSbillDetail.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
})
@RequestMapping(value="/listSumSamtGroupByUseridBizMonth",method=RequestMethod.GET)
public Map<String,Object> listSumSamtGroupByUseridBizMonth( @RequestParam Map<String,Object> xmTaskSbillDetail){
Map<String,Object> m = new HashMap<>();
Tips tips=new Tips("查询成功");
String bizYear= (String) xmTaskSbillDetail.get("bizYear");
if(!StringUtils.hasText(bizYear)){
return ResponseHelper.failed("bizYear-0","年份不能为空");
}
User user=LoginUtils.getCurrentUserInfo();
xmTaskSbillDetail.put("branchId",user.getBranchId());
List<Map<String,Object>> xmTaskSbillDetailList = xmTaskSbillDetailService.listSumSamtGroupByUseridBizMonth(xmTaskSbillDetail); //列出XmTaskSbillDetail列表
m.put("data",xmTaskSbillDetailList);
m.put("tips", tips);
return m;
}
@ApiOperation( value = "查询项目支出费用按月分布报表",notes=" ")
@ApiResponses({
@ApiResponse(code = 200,response=XmTaskSbillDetail.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
})
@RequestMapping(value="/listSumSamtGroupByProjectIdBizMonth",method=RequestMethod.GET)
public Map<String,Object> listSumSamtGroupByProjectIdBizMonth( @RequestParam Map<String,Object> xmTaskSbillDetail){
Map<String,Object> m = new HashMap<>();
Tips tips=new Tips("查询成功");
String bizYear= (String) xmTaskSbillDetail.get("bizYear");
if(!StringUtils.hasText(bizYear)){
return ResponseHelper.failed("bizYear-0","年份不能为空");
}
User user=LoginUtils.getCurrentUserInfo();
xmTaskSbillDetail.put("branchId",user.getBranchId());
List<Map<String,Object>> xmTaskSbillDetailList = xmTaskSbillDetailService.listSumSamtGroupByProjectIdBizMonth(xmTaskSbillDetail); //列出XmTaskSbillDetail列表
m.put("data",xmTaskSbillDetailList);
m.put("tips", tips);
return m;
}
@ApiOperation( value = "查询机构支出费用按月分布报表",notes=" ")
@ApiResponses({
@ApiResponse(code = 200,response=XmTaskSbillDetail.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
})
@RequestMapping(value="/listSumSamtGroupByBranchIdBizMonth",method=RequestMethod.GET)
public Map<String,Object> listSumSamtGroupByBranchIdBizMonth( @RequestParam Map<String,Object> xmTaskSbillDetail){
Map<String,Object> m = new HashMap<>();
Tips tips=new Tips("查询成功");
String bizYear= (String) xmTaskSbillDetail.get("bizYear");
if(!StringUtils.hasText(bizYear)){
return ResponseHelper.failed("bizYear-0","年份不能为空");
}
User user=LoginUtils.getCurrentUserInfo();
xmTaskSbillDetail.put("branchId",user.getBranchId());
List<Map<String,Object>> xmTaskSbillDetailList = xmTaskSbillDetailService.listSumSamtGroupByBranchIdBizMonth(xmTaskSbillDetail); //列出XmTaskSbillDetail列表
m.put("data",xmTaskSbillDetailList);
m.put("tips", tips);
return m;
}
/**
@ApiOperation( value = "新增一条工时登记表信息",notes=" ")
@ApiResponses({
@ -155,8 +217,6 @@ public class XmTaskSbillDetailController {
}
*/
@ApiOperation( value = "批量修改某些字段",notes="")
@ApiResponses({
@ApiResponse(code = 200,response=XmTaskSbillDetail.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")

13
xm-core/src/main/java/com/xm/core/service/XmTaskSbillDetailService.java
View File

@ -101,5 +101,18 @@ public class XmTaskSbillDetailService extends BaseService {
}
public List<Map<String, Object>> listSumSamtGroupByUseridBizMonth(Map<String, Object> xmTaskSbillDetail) {
return super.selectList("listSumSamtGroupByUseridBizMonth",xmTaskSbillDetail);
}
public List<Map<String, Object>> listSumSamtGroupByProjectIdBizMonth(Map<String, Object> xmTaskSbillDetail) {
return super.selectList("listSumSamtGroupByProjectIdBizMonth",xmTaskSbillDetail);
}
public List<Map<String, Object>> listSumSamtGroupByBranchIdBizMonth(Map<String, Object> xmTaskSbillDetail) {
return super.selectList("listSumSamtGroupByBranchIdBizMonth",xmTaskSbillDetail);
}
}

28
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillDetailMapper.xml
View File

@ -12,7 +12,8 @@
</foreach>
</if>
<if test="key != null and key !='' "> </if>
</sql>
<if test="biz_year!=null and bizYear!=''"> and biz_date like concat(#{bizYear},'%')</if>
</sql>
<select id="selectListByUserTasks" parameterType="com.xm.core.vo.BatchJoinToSbillVo" resultType="com.xm.core.entity.XmTaskSbillDetail">
select * from xm_task_sbill_detail res
<where>
@ -25,7 +26,32 @@
</foreach>
</where>
</select>
<select id="listSumSamtGroupByUseridBizMonth" parameterType="HashMap" resultType="HashMap">
select sum(ifnull(res.samt,0)) as samt,max(res.username) as username,res.biz_month from xm_task_sbill_detail res
<where>
<include refid="whereForMap"/>
<include refid="where"/>
</where>
group by res.userid,res.biz_month
</select>
<select id="listSumSamtGroupByProjectIdBizMonth" parameterType="HashMap" resultType="HashMap">
select sum(ifnull(res.samt,0)) as samt,res.project_id,res.biz_month from xm_task_sbill_detail res
<where>
<include refid="whereForMap"/>
<include refid="where"/>
</where>
group by res.project_id,res.biz_month
</select>
<select id="listSumSamtGroupByBranchIdBizMonth" parameterType="HashMap" resultType="HashMap">
select sum(ifnull(res.samt,0)) as samt,res.branch_id,res.biz_month from xm_task_sbill_detail res
<where>
<include refid="whereForMap"/>
<include refid="where"/>
</where>
group by res.branch_id,res.biz_month
</select>
<!--结束 自定义sql函数区域-->

Write Preview
Loading…
Cancel
Save