11/24

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.java

@@ -19,6 +19,7 @@ public interface ProjectDailyMapper extends BaseMapper<ProjectDaily> {
     ProjectDailyVos getProjectDaily( @Param("orderDate") String  orderDate, @Param("projectSid") String  projectSid);
     List<ProjectDailyVos> getProjectDailys ( @Param(Constants.WRAPPER) Wrapper<ProjectDaily> ew);
     ProjectDailyVosBig getProjectDailySum( @Param(Constants.WRAPPER) Wrapper<ProjectDaily> ew);
+    List<ProjectDailyVosBig> getProjectDailysSum( @Param(Constants.WRAPPER) Wrapper<ProjectDaily> ew);
     ProjectDailyVosBig getProjectDailyInSid( @Param(Constants.WRAPPER) Wrapper<ProjectDaily> ew);
     List<ProjectDailyVosBig> getInventoryByOrderDate( @Param(Constants.WRAPPER) Wrapper<ProjectDaily> ew);
 }

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.xml

@@ -40,6 +40,19 @@
             ${ew.sqlSegment}
         </where>
     </select>
+    <select id="getProjectDailysSum" resultType="com.yxt.supervise.report.biz.projectdaily.ProjectDailyVosBig">
+        select sum(accountsBalance) as accountsBalance ,
+        sum(accountsReceivable) as accountsReceivable ,
+        sum(stockAmount) as stockAmount ,
+        sum(transitAmount) as transitAmount ,
+        sum(advancePayment) as advancePayment,
+        orderDate
+        from project_daily
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
     <select id="getProjectDailyInSid" resultType="com.yxt.supervise.report.biz.projectdaily.ProjectDailyVosBig">
         select sum(useLimit) as useLimit
         from project_daily

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyRest.java

@@ -57,8 +57,8 @@ public class ProjectDailyRest {
     }
     @ApiOperation("添加项目监管报表信息")
     @PostMapping("/saveDaily")
-    public ResultBean saveDaily(@RequestBody ProjectDailyDto dto) {
+    public ResultBean saveDaily(@RequestBody ProjectDailyDto dto,@RequestHeader("token")String token) {
-        return projectDailyService.save(dto);
+        return projectDailyService.save(dto,token);
     }
 
     @PostMapping("/uploadfile")

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java

@@ -198,10 +198,16 @@ public class ProjectDailyService extends ServiceImpl<ProjectDailyMapper, Project
 //        map.put("list",list);
 //        return map;
 //    }
-    public ResultBean save(ProjectDailyDto dto) {
+    public ResultBean save(ProjectDailyDto dto,String token) {
         ResultBean rb = ResultBean.fireFail();
+        SysUserVo sysUserVo=sysUserFeign.loginDetailsNew(token).getData();
         ProjectDaily projectDaily = new ProjectDaily();
         BeanUtil.copyProperties(dto, projectDaily);
+        if(null!=sysUserVo){
+            projectDaily.setUserSid(sysUserVo.getSid());
+            projectDaily.setUserMobile(sysUserVo.getMobile());
+            projectDaily.setUserName(sysUserVo.getName());
+        }
         String pledgeRateNormal = projectDaily.getPledgeRateNormal();
         projectDaily.setPledgeRate(Double.parseDouble(pledgeRateNormal));
         projectDaily.setReportTime(projectDaily.getOrderDate() + " " + DateUtil.format(new Date(), "HH:mm"));
@@ -233,6 +239,8 @@ public class ProjectDailyService extends ServiceImpl<ProjectDailyMapper, Project
             dailyAccountDto.setProjectSid(dto.getProjectSid());
             projectDailyAccountService.save(dailyAccountDto);
         }
+        //发送微信模版消息通知
+        sendMess(dto.getProjectSid(),dto.getOrderDate());
         return rb.success().setMsg("添加成功");
     }
 
@@ -256,6 +264,11 @@ public class ProjectDailyService extends ServiceImpl<ProjectDailyMapper, Project
         ProjectInfo projectInfo= crmMapper.getProjectBySid(projectSid);
         if(null!=projectDaily){
             if(null!=projectInfo) {
+                if(com.yxt.common.base.utils.StringUtils.isBlank(projectDaily.getUserName())){
+                    projectDaily.setUserName(projectInfo.getRegulatoryLeader());
+                    String mobile =systemMapper.getUserByName(projectInfo.getRegulatoryLeader());
+                    projectDaily.setUserMobile(mobile);
+                }
                 projectDaily.setCreditLimit(projectInfo.getCreditLimit());
                 projectDaily.setUseLimit(projectInfo.getUseLimit());
                 projectDaily.setBankPledgeRate(projectInfo.getBankPledgeRate());
@@ -435,8 +448,11 @@ public class ProjectDailyService extends ServiceImpl<ProjectDailyMapper, Project
             }
         if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getProjectSid())) {
                 qw.eq("projectSid", query.getProjectSid());
-            }
+                qw.groupBy("orderDate");
-        List<ProjectDailyVos> projectDailyVos=baseMapper.getProjectDailys(qw);
+            }else{
+                qw.groupBy("orderDate");
+        }
+        List<ProjectDailyVosBig> projectDailyVos=baseMapper.getProjectDailysSum(qw);
         List<String> a=new ArrayList<>();
         List<String> b=new ArrayList<>();
         List<String> c=new ArrayList<>();
@@ -445,14 +461,15 @@ public class ProjectDailyService extends ServiceImpl<ProjectDailyMapper, Project
         List<String> f=new ArrayList<>();
         //14
         for(int k=0;k<i+1;k++){
-            String date=sdf.format(DateUtil.offsetDay(DateUtil.parse(EndDate),k));
+//            String date=sdf.format(DateUtil.offsetDay(DateUtil.parse(EndDate),k));
+            String date=sdf.format(DateUtil.offsetDay(DateUtil.parse(startDate),-k));
             a.add(date);
             b.add("0");
             c.add("0");
             d.add("0");
             e.add("0");
             f.add("0");
-            for(ProjectDailyVos vo:projectDailyVos){
+            for(ProjectDailyVosBig vo:projectDailyVos){
                 if(vo.getOrderDate().equals(date)){
                     b.set(k,String.valueOf(vo.getAccountsBalance()));
                     c.set(k,String.valueOf(vo.getAccountsReceivable()));

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyVos.java

@@ -67,6 +67,12 @@ public class ProjectDailyVos {
     private int yingShou;
     private double ysUseLimit;
 
+    public String getRemarks() {
+        if(StringUtils.isBlank(remarks)){
+            return remarks="暂无工作日报";
+        }
+        return remarks;
+    }
 
     /**
      * 计算出的质押率

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/system/systemMapper.java

@@ -22,4 +22,10 @@ public interface systemMapper extends BaseMapper<com.yxt.supervise.report.ds.sys
     SysUser getAppletOpenidByUsersid(@Param("userSid") String userSid);
     @Select("select sid from sys_user where appletOpenid=#{openid}")
     String getUserSidByOpenid(@Param("openid")String openid);
+    @Select("SELECT user\n" +
+            "\t.mobile \n" +
+            "FROM\n" +
+            "\tsys_user user\n" +
+            "\tLEFT JOIN sys_staffinfo info on info.sid=user.staffSid where info.name like CONCAT('%',#{name},'%')")
+    String getUserByName(@Param("name")String name);
 }