山海数据大屏

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectphaserecord/ProjectPhaseRecord.java

@@ -11,9 +11,11 @@ import lombok.Data;
  */
 @Data
 @ApiModel(value = "项目阶段 ", description = "项目阶段")
-@TableName("project_phase")
+@TableName("project_phase_record")
 public class ProjectPhaseRecord extends BaseEntity {
-    private String projectSid;
+    private String enterpriseSid;
+    private String orderDate;
+    private String total;
     private String nodeKey;
     private String nodeValue;
 }

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectphaserecord/ProjectPhaseRecordVo.java

@@ -9,7 +9,9 @@ import lombok.Data;
  */
 @Data
 public class ProjectPhaseRecordVo implements Vo {
-    private String projectSid;
+    private String enterpriseSid;
+    private String orderDate;
+    private String total;
     private String nodeKey;
     private String nodeValue;
 }

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java

@@ -258,14 +258,23 @@ public class ProjectInformationService extends MybatisBaseService<ProjectInforma
             JSONArray jsonArray=com.alibaba.fastjson.JSONObject.parseObject(forEntity.getBody()).getJSONArray("data");
             for (int i = 0; i < jsonArray.size(); i++) {
                 WarehouseInfo vo= JSON.toJavaObject(jsonArray.getJSONObject(i),WarehouseInfo.class);
-                if(s.size()!=0){
-                    for (StoreHouseProjectVo storeHouseProjectVo : s) {
-                        if(vo.getSid()!=storeHouseProjectVo.getShSid()){
-                            warehouseInfos.add(vo);
-                        }
+//                if(s.size()!=0){
+//                    for (StoreHouseProjectVo storeHouseProjectVo : s) {
+//                        if(vo.getSid()!=storeHouseProjectVo.getShSid()){
+//                            warehouseInfos.add(vo);
+//                        }
+//                    }
+//                }else{
+//                    warehouseInfos.add(vo);
+//                }
+                warehouseInfos.add(vo);
+            }
+            for (int i = 0; i < jsonArray.size(); i++) {
+                for (StoreHouseProjectVo storeHouseProjectVo : s) {
+                    WarehouseInfo vo= JSON.toJavaObject(jsonArray.getJSONObject(i),WarehouseInfo.class);
+                    if(vo.getSid()!=storeHouseProjectVo.getShSid()){
+                        warehouseInfos.remove(vo);
                     }
-                }else{
-                    warehouseInfos.add(vo);
                 }
             }
         }

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectphaserecord/ProjectPhaseRecordMapper.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.supervise.crm.api.projectphase.ProjectPhase;
 import com.yxt.supervise.crm.api.projectphase.ProjectPhaseVo;
+import com.yxt.supervise.crm.api.projectphaserecord.ProjectPhaseRecord;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -16,8 +17,7 @@ import java.util.List;
  * @date 2023/4/23 11:49
  */
 @Mapper
-public interface ProjectPhaseRecordMapper extends BaseMapper<ProjectPhase> {
-    IPage<ProjectPhaseVo> selectPageVo(IPage<ProjectPhase> page, @Param(Constants.WRAPPER) Wrapper<ProjectPhase> qw);
-    List<ProjectPhaseVo> getNodeByProjectSid(@Param("projectSid") String projectSid);
+public interface ProjectPhaseRecordMapper extends BaseMapper<ProjectPhaseRecord> {
+
 
 }

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectphaserecord/ProjectPhaseRecordRest.java

@@ -6,6 +6,7 @@ import com.yxt.common.core.vo.PagerVo;
 import com.yxt.supervise.crm.api.projectphase.ProjectPhaseDto;
 import com.yxt.supervise.crm.api.projectphase.ProjectPhaseQuery;
 import com.yxt.supervise.crm.api.projectphase.ProjectPhaseVo;
+import com.yxt.supervise.crm.api.projectphaserecord.ProjectPhaseRecordDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,7 +30,7 @@ public class ProjectPhaseRecordRest {
 
     @ApiOperation("保存")
     @PostMapping("/save")
-    public ResultBean save(@RequestBody ProjectPhaseDto dto) {
+    public ResultBean save(@RequestBody ProjectPhaseRecordDto dto) {
         return ProjectPhaseService.saveProjectPhase(dto);
     }
 

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectphaserecord/ProjectPhaseRecordService.java

@@ -12,6 +12,8 @@ import com.yxt.supervise.crm.api.projectphase.ProjectPhase;
 import com.yxt.supervise.crm.api.projectphase.ProjectPhaseDto;
 import com.yxt.supervise.crm.api.projectphase.ProjectPhaseQuery;
 import com.yxt.supervise.crm.api.projectphase.ProjectPhaseVo;
+import com.yxt.supervise.crm.api.projectphaserecord.ProjectPhaseRecord;
+import com.yxt.supervise.crm.api.projectphaserecord.ProjectPhaseRecordDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -22,7 +24,7 @@ import java.util.List;
  * @date 2023/4/23 11:49
  */
 @Service
-public class ProjectPhaseRecordService extends MybatisBaseService<ProjectPhaseRecordMapper, ProjectPhase> {
+public class ProjectPhaseRecordService extends MybatisBaseService<ProjectPhaseRecordMapper, ProjectPhaseRecord> {
     @Autowired
     com.yxt.supervise.crm.feign.system.SysUserFeign sysUserFeign;
 
@@ -33,9 +35,9 @@ public class ProjectPhaseRecordService extends MybatisBaseService<ProjectPhaseRe
      * @param dto 数据传输对象
      * @return
      */
-    public ResultBean saveProjectPhase(ProjectPhaseDto dto) {
+    public ResultBean saveProjectPhase(ProjectPhaseRecordDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        ProjectPhase entity=new ProjectPhase();
+        ProjectPhaseRecord entity=new ProjectPhaseRecord();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
         baseMapper.insert(entity);
         return rb.success();

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/storehouseproject/StoreHouseProjectMapper.java

@@ -19,8 +19,8 @@ public interface StoreHouseProjectMapper extends BaseMapper<StoreHouseProject> {
     List<StoreHouseProjectVo> selectStoreBySid(@Param("sid")String sid);
     @Select("select * from storehouse_project where projectSid=#{sid} and type =#{type}")
     List<StoreHouseProjectVo> selectStoreBySid1(@Param("sid")String sid,@Param("type")String type);
-    @Select("select * from  storehouse_project a left join enterprise_project b on a.projectSid =b.projectSid  where b.enterpriseSid=#{enterpriseSid} and  a.type =#{type} ")
-    List<StoreHouseProjectVo> selectStoreBySid2(@Param("enterpriseSid")String enterpriseSid,@Param("type")String type);
+    @Select("select * from  storehouse_project a left join enterprise_project b on a.projectSid =b.projectSid  where b.projectSid=#{projectSid} and  a.type =#{type} ")
+    List<StoreHouseProjectVo> selectStoreBySid2(@Param("projectSid")String projectSid,@Param("type")String type);
     @Select("select * from storehouse_project where shSid=#{sid}")
     StoreHouseProjectVo selectProjectByshSid(@Param("sid")String sid);
     @Select("select shSid from storehouse_project")

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterRest.java

@@ -222,7 +222,9 @@ public class DataCenterRest {
         shDateCenterVo.setUpstreamEnterprises(jsonObject1);
         List<ProjectInfo> projectInfoList=crmMapper.getProjectcs(projectInfo.get(0).getEnterpriseSid());
         List<ProjectInfo> projectInfoLists=crmMapper.getNodeValue(projectInfo.get(0).getEnterpriseSid());
+        int b=0;
         for (ProjectInfo info : projectInfoList) {
+            System.out.println(b++);
             shDateCenterVo.setTotalSxLimit(shDateCenterVo.getTotalSxLimit().add(info.getCreditLimitN()));
             shDateCenterVo.setTotalYxLimit(shDateCenterVo.getTotalYxLimit().add(info.getUseLimitN()));
         }
@@ -276,8 +278,12 @@ public class DataCenterRest {
         List<ProjectInfo> projectInfo=crmMapper.getEnterByProjetSid(query.getProjectSid());
         List<ProjectInfo> projectInfoLists=crmMapper.getNodeValue(projectInfo.get(0).getEnterpriseSid());
         Integer w=crmMapper.getEnterpirseCount(projectInfo.get(0).getEnterpriseSid());
+        String a1 ="https://wms.yxtsoft.com/apiv1/external/v1/crmcustomertemp/getCustomerByOrgSid?orgSid="+projectInfo.get(0).getEnterpriseSid();
+        RestTemplate restTemplate = new RestTemplate();
+        ResponseEntity<String> forEntity = restTemplate.getForEntity(a1,String.class);
+        Integer jsonObject = JSONObject.parseObject(forEntity.getBody()).getInteger("data");
         map.put("loanEnterprise","1");
-        map.put("ensureEnterprise","1");
+        map.put("ensureEnterprise",jsonObject);
         map.put("bank","1");
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         String EndDate=sdf.format(DateUtil.offsetDay(DateUtil.parse(query.getStartDate()),-Integer.parseInt(query.getIntervalTime())+1));
@@ -390,19 +396,26 @@ public class DataCenterRest {
         map.put("list",projectRecordVos);
         return rb.success().setData(map);
     }
-//    @Scheduled(cron = "57 * * * * ?")
+
+
+    @ApiOperation("dingshi")
+    @GetMapping("/rr")
+    @Scheduled(cron = "0 0 0 * * ? ")
     public void rr(){
         List<ProjectInfo> projectInfoLists=crmMapper.getProjectcs("0d19bc72-9370-45d3-bfda-5662eab34e4b");
         List<ProjectInfo> projectInfo1=crmMapper.getNodeValue("0d19bc72-9370-45d3-bfda-5662eab34e4b");
         for (ProjectInfo info : projectInfo1) {
             ProjectPhaseRecordDto dto=new ProjectPhaseRecordDto();
-            dto.setOrderDate(new Date().toString());
+            SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+            dto.setOrderDate(sdf.format(new Date()).toString());
             dto.setEnterpriseSid(info.getEnterpriseSid());
             dto.setNodeKey(info.getNodeKey());
             dto.setNodeValue(info.getNodeValue());
             for (ProjectInfo projectInfoList : projectInfoLists) {
-                if(info.getNodeValue().equals(projectInfoList.getNodeValue())){
-                    dto.setTotal(dto.getTotal().add(projectInfoList.getUseLimitN()));
+                if(StringUtils.isNotBlank(projectInfoList.getNodeValue())){
+                    if(info.getNodeValue().equals(projectInfoList.getNodeValue())){
+                        dto.setTotal(dto.getTotal().add(projectInfoList.getUseLimitN()));
+                    }
                 }
             }
             projectPhaseRecordFeign.save(dto);

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectphaserecord/ProjectPhaseRecordDto.java

@@ -14,7 +14,7 @@ public class ProjectPhaseRecordDto implements Dto {
     private String sid;
     private String enterpriseSid;
     private String orderDate;
-    private BigDecimal total;
+    private BigDecimal total=new BigDecimal(0);
     private String nodeKey;
     private String nodeValue;
 }

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java

@@ -101,9 +101,24 @@ public interface CrmMapper extends BaseMapper<ProjectInfo> {
 
     @Select("select count(sid) from enterprise_project where enterpriseSid=#{enterpriseSid}")
     Integer getEnterpirseCount(@Param("enterpriseSid") String enterpriseSid);
-    @Select("select type,sum(money) as sumMoney from project_credit_balance a left join project_information b on b.sid=a.projectSid where b.enterpriseSid=#{enterpriseSid} and tbdate>=#{start} and tbdate<=#{end} GROUP BY a.type ")
+    @Select("select type,sum(money) as sumMoney from project_credit_balance a " +
+            "left join project_information b on b.sid=a.projectSid " +
+            "left join enterprise_project c on c.projectSid =a.projectSid " +
+            "where c.enterpriseSid=#{enterpriseSid} and tbdate>=#{start} and tbdate<=#{end} GROUP BY a.type ")
     List<ProjectInfo> sumMoney(@Param("enterpriseSid") String enterpriseSid,@Param("start")String start,@Param("end")String end);
-    @Select("select a.*,b.sid as enterpriseSid,c.enterpriseName as enterpriseName from project_credit_balance a left join project_information b on b.sid=a.projectSid left join enterprise_information c on c.sid=b.enterpriseSid where b.enterpriseSid=#{enterpriseSid} and tbdate>=#{start} and tbdate<=#{end} ")
+    @Select("SELECT\n" +
+            "\ta.*,\n" +
+            "\tb.sid AS enterpriseSid,\n" +
+            "\td.enterpriseName AS enterpriseName \n" +
+            "FROM\n" +
+            "\tproject_credit_balance a\n" +
+            "\tLEFT JOIN project_information b ON b.sid = a.projectSid\n" +
+            "\tLEFT JOIN enterprise_project c ON c.projectSid = a.projectSid \n" +
+            "\tLEFT JOIN enterprise_information d ON d.sid = c.enterpriseSid \n" +
+            "WHERE\n" +
+            "\td.sid = #{enterpriseSid} \n" +
+            "\tAND tbdate >=#{start} \n" +
+            "\tAND tbdate <=#{end} ")
     List<ShCreditBalanceCrmVo> getRecordByEnterpriseSid(@Param("enterpriseSid") String enterpriseSid, @Param("start")String start, @Param("end")String end);
 
     @Select("select * from project_phase_record a  where a.enterpriseSid=#{enterpriseSid} and orderDate=#{orderDate} and nodeKey=#{nodeKey} ")

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectphaserecord/ProjectPhaseRecordFeign.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 @FeignClient(
         contextId = "supervise-crm-projectphaserecord",
         name = "supervise-crm",
-        path = "v1/projectphaserecord")
+        path = "v1/ProjectPhaserecord")
 public interface ProjectPhaseRecordFeign {