diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCostOutputController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCostOutputController.java index 38bfc22a..ff11e359 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCostOutputController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCostOutputController.java @@ -1,8 +1,10 @@ package com.yanzhu.jh.bigscreen.web.controller; import com.ruoyi.common.constant.Constants; +import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.redis.RedisCache; +import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.sign.Md5Utils; import com.yanzhu.jh.project.domain.SurProjectCostOutput; import com.yanzhu.jh.project.service.ISurProjectCostOutputService; @@ -11,11 +13,12 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Map; import java.util.concurrent.TimeUnit; @RestController @RequestMapping("/bgscreen/costOut") -public class ProjectCostOutputController { +public class ProjectCostOutputController extends BaseController { @Autowired private RedisCache redisCache; @@ -54,5 +57,38 @@ public class ProjectCostOutputController { return AjaxResult.success(list); } + /** + * 分类汇总,用于大屏 【工程审批】【付款金额】 + * @param where + * @return + */ + @PostMapping("/sumForBsEnginAuditing") + public AjaxResult sumForBsEnginAuditing(@RequestBody SurProjectCostOutput where){ + Long deptId=where.getId(); + if(deptId==null||deptId<=0){ + if (SecurityUtils.isUserB()) { + where.setPrjIds(getProjectIds()); + } + } + List list=surProjectCostOutputService.sumForBsEnginAuditing(where); + return AjaxResult.success(list); + } + + /** + * 项目付款明细,用于大屏【工程审批】【付款金额】 + * @param where + * @return + */ + @PostMapping("/selectForBigEnginList") + public AjaxResult selectForBigEnginList(@RequestBody SurProjectCostOutput where){ + Long deptId=where.getId(); + if(deptId==null||deptId<=0){ + if (SecurityUtils.isUserB()) { + where.setPrjIds(getProjectIds()); + } + } + Map>> list=surProjectCostOutputService.selectForBigEnginList(where); + return AjaxResult.success(list); + } } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectCostOutputMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectCostOutputMapper.java index affeec3f..60c630f2 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectCostOutputMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectCostOutputMapper.java @@ -63,4 +63,19 @@ public interface SurProjectCostOutputMapper public List selectYearAndMonth(SurProjectCostOutput where); List sumByDeptId(SurProjectCostOutput where); + + + /** + * 分类汇总,用于大屏 【工程审批】【付款金额】 + * @param where + * @return + */ + public List sumForBsEnginAuditing(SurProjectCostOutput where); + + /** + * 项目付款明细,用于大屏【工程审批】【付款金额】 + * @param where + * @return + */ + public List selectForBigEnginList(SurProjectCostOutput where); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCostOutputService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCostOutputService.java index 6785df70..1aa33609 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCostOutputService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCostOutputService.java @@ -3,6 +3,7 @@ package com.yanzhu.jh.project.service; import com.yanzhu.jh.project.domain.SurProjectCostOutput; import java.util.List; +import java.util.Map; /** * 项目成本产值Service接口 @@ -80,4 +81,17 @@ public interface ISurProjectCostOutputService * @return */ public int batchUpdate(List list); + /** + * 分类汇总,用于大屏 【工程审批】【付款金额】 + * @param where + * @return + */ + public List sumForBsEnginAuditing(SurProjectCostOutput where); + + /** + * 项目付款明细,用于大屏【工程审批】【付款金额】 + * @param where + * @return + */ + public Map>> selectForBigEnginList(SurProjectCostOutput where); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCostOutputServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCostOutputServiceImpl.java index 4b5dde38..4f25da60 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCostOutputServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCostOutputServiceImpl.java @@ -1,9 +1,6 @@ package com.yanzhu.jh.project.service.impl; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; +import java.util.*; import com.ruoyi.common.utils.DateUtils; @@ -173,6 +170,7 @@ public class SurProjectCostOutputServiceImpl implements ISurProjectCostOutputSer @Override public int batchUpdate(List list) { SurProjectCostOutput where=new SurProjectCostOutput(); + where.setProjectId(list.get(0).getProjectId()); where.setCostType(11l);//工程进度款支付 List contractList=selectSurProjectCostOutputList(where); where.setCostType(12l);//安措费支付明细 @@ -204,5 +202,48 @@ public class SurProjectCostOutputServiceImpl implements ISurProjectCostOutputSer } return list.size(); } + /** + * 分类汇总,用于大屏 【工程审批】【付款金额】 + * @param where + * @return + */ + @Override + public List sumForBsEnginAuditing(SurProjectCostOutput where) { + return surProjectCostOutputMapper.sumForBsEnginAuditing(where); + } + + /** + * + * @param where + * @return + */ + @Override + public Map>> selectForBigEnginList(SurProjectCostOutput where) { + List list=surProjectCostOutputMapper.selectForBigEnginList(where); + Map>> map=new HashMap<>(); + List list11;//=new ArrayList<>(); + List list12;//=new ArrayList<>(); + List> plist; + for(SurProjectCostOutput it:list){ + String pname=it.getRemark(); + if(!map.containsKey(pname)){ + list12=new ArrayList<>(); + list11=new ArrayList<>(); + plist=new ArrayList<>(); + plist.add(list12); + plist.add(list11); + map.put(pname,plist); + } + plist=map.get(pname); + list12=plist.get(0); + list11=plist.get(1); + if(it.getCostType().equals(12l)){ + list12.add(it); + }else{ + list11.add(it); + } + } + return map; + } } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceJgwTask.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceJgwTask.java index 98a19eae..26aa3f9a 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceJgwTask.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceJgwTask.java @@ -138,8 +138,8 @@ public class AttendanceJgwTask { String appid="6a6f24fe35b04ee0bcf31cfb46ed1051"; String secret="c3h5enh4MjAyNHN1Yw=="; //String prjId="db955e11ef774e63968a47c3dc2acc15";//"b67f1baa6dca4558a16bf90a4681b82e";// - String prjId="fa0a3e017ead4d4aa31eeb0ab6e4eda9";//泾河新城荟锦坊二期 - String phone="17697358473"; + String prjId="cace2f676371427e8f6da20d2924f64e";//泾河新城荟锦坊二期 + String phone="15619028761"; String token= getToken(appid,secret); if(token==null || token.length()==0){ return; @@ -147,16 +147,16 @@ public class AttendanceJgwTask { System.out.println(token); System.out.println(DateUtil.format(DateTime.now(),"yyyy-MM-dd")); String subcontractorId=new AttendanceJgwTask().getSubcontractor(appid,token,phone); - String leaderTeamId="9a7cda9fd629495b8acc615a54c00625"; + String leaderTeamId="b3774a8cd04c418dabf36bffbf276661"; System.out.println(subcontractorId); //findWorkerByLeader(appid,token,leaderTeamId); //findDirectlyUnderTeam(appid,token,prjId,subcontractorId,0); //queryProject(appid,token,phone,0);; //findAddWorkerByProject(appid,token,prjId,0); //findUpdateWorkerByProject(appid,token,prjId,0); - findAttendanceByProject(appid,token,prjId,"0"); + //findAttendanceByProject(appid,token,prjId,"0"); //findTeamByProjectId(appid,token,prjId); - //findProContractorByProjectId(appid,token,prjId); + findProContractorByProjectId(appid,token,prjId); //getJobTypeData(appid,token,"0"); //findDirectlyUnderTeam(appid,token,prjId); } @@ -385,7 +385,12 @@ public class AttendanceJgwTask { JSONObject j= JSON.parseObject(data); JSONObject jd=j.getJSONObject("data"); JSONArray arr=jd.getJSONArray("recordList"); - JSONObject jo=arr.getJSONObject(0); + for(int i=0;i and spco.project_id=#{projectId} + UNION SELECT 2 cost_type , SUM(spco.money) money FROM sur_project_cost_output spco @@ -160,4 +161,132 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + \ No newline at end of file diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml index 9fdec63d..1f1b5bb1 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml @@ -311,7 +311,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SUM(c.totalInvestment) COUNT(1)*10000 cnt FROM sur_project a, sys_dict_data b,vw_sur_project_cost_output c WHERE b.dict_type='project_category' AND a.id=c.project_id - AND a.projectType=b.dict_value and a.isDel=0 and a.progressVisible=0 + AND a.projectType=b.dict_value and a.isDel=0 + and a.progressVisible=0 AND deptid=#{deptId} and projectType = #{proType} GROUP BY dict_value,dict_label @@ -337,7 +338,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SUM(c.totalInvestment) cnt FROM sur_project a, sys_dict_data b ,vw_sur_project_cost_output c WHERE b.dict_type='project_level' AND a.id=c.project_id - AND a.projiectLevel=b.dict_value and a.isDel=0 and a.progressVisible=0 + AND a.projiectLevel=b.dict_value and a.isDel=0 + and a.progressVisible=0 AND deptid=#{deptId} and projectType = #{proType} GROUP BY dict_value,dict_label