Merge remote-tracking branch 'origin/master'

blade-service-api/blade-business-api/src/main/java/org/springblade/business/dto/MileagexyDTO.java

@@ -17,6 +17,9 @@ public class MileagexyDTO {
     private Integer orderNum = 0;     //顺序
     private Integer type = 0;     //类型 0 起点  1交点  2终点
     private Double angle = 0.0;     //方位角
+    private Integer du = 0;        // 度
+    private Integer fen = 0;        // 分
+    private Double miao = 0.0;
     private Double corner = 0.0;     //转角
     private String swing = "右转";     //转向
     private Double ls1 = 0.0;         //第一缓和线

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WtcEva.java

@@ -18,6 +18,7 @@ public class WtcEva {
     private Long contractId;
     private String treeCode;
     private Long parentId;
+    private Long pKeyId;
     public boolean isEva(){
       return Objects.requireNonNull(this.nodeName, "nodeName不能为空").contains("评定");
   }

blade-service/blade-business/src/main/java/org/springblade/business/controller/MileageController.java

@@ -201,7 +201,7 @@ public class MileageController {
 
 
     @PostMapping("/getNextMileagexy")
-    public Mileagexy getNextMileagexy(@RequestBody Mileagexy mileagexy) {
+    public R<Mileagexy> getNextMileagexy(@RequestBody Mileagexy mileagexy) {
         Mileagexy nextmileagexy = new Mileagexy();
         Mileagexy max = service.getMaxMileagexy(mileagexy.getPartId(), 0, mileagexy.getProjectId(), mileagexy.getOrderNum());
         if (max != null) {
@@ -209,7 +209,7 @@ public class MileageController {
             nextmileagexy.setR(max.getR());
             nextmileagexy.setSwing(max.getSwing());
         }
-        return nextmileagexy;
+        return R.data(nextmileagexy);
     }
 
 

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/FormulaController.java

@@ -938,5 +938,12 @@ public class FormulaController {
          return this.service.evaluate(tablePkeyId);
     }
 
+    @GetMapping("/test")
+    public R<Object> meter(Long contractId,Long periodId ,Integer type){
+        /* public  List<ReportResult> execute3(Long contractId,Long periodId ,Integer type)*/
+        return R.data(this.service.execute3(contractId,periodId,type));
+    }
+
+
 
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/FormulaServiceImpl.java

@@ -1571,6 +1571,13 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
        try {
            List<WbsTreeContract> list =this.wbsTreeContractService.list(Wrappers.<WbsTreeContract>lambdaQuery().eq(WbsTreeContract::getInitTableName,wtc.getInitTableName()).eq(WbsTreeContract::getContractId,wtc.getContractId()).eq(WbsTreeContract::getParentId,wtc.getParentId()).orderByAsc(WbsTreeContract::getCreateTime));
            int length=list.size();
+           /*如果没保存过会导致数据无法更新*/
+           if(length==1){
+              List<Map<String,Object>>  checkMap= this.jdbcTemplate.queryForList("select id from "+wtc.getInitTableName()+" where p_key_Id=" +wtc.getPKeyId());
+              if(checkMap.size()==0){
+                  this.jdbcTemplate.execute("insert into "+wtc.getInitTableName() +"(id,p_key_id) values ("+SnowFlakeUtil.getId()+","+wtc.getPKeyId()+")");
+              }
+           }
            if(pageSizeNow>0&&pageSizeNow!=length){
                int dx = pageSizeNow-length;
                if(dx>0) {
@@ -2490,6 +2497,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                     "select b.tree_code treeCode ,a.contract_id contractId,a.init_table_name initTableName,a.html_url htmlUrl ,a.node_name nodeName ,a.parent_id parentId from m_wbs_tree_contract a join m_wbs_tree_contract b on (a.parent_id=b.id and a.contract_id=b.contract_id) where a.p_key_id ="
                             + pkeyId, WtcEva.class);
             if(wtcEva.isEva()){
+                wtcEva.setPKeyId(pkeyId);
                 List<FormData> processFds = this.createFormDataByTableName(wtcEva.getInitTableName());
                 LinkedList<String> treeCode = new LinkedList<>(FormulaUtils.treeCodeSplit(wtcEva.getTreeCode()));
                 FB02 fb02 = new FB02(processFds);
@@ -2526,8 +2534,8 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
     public  List<ReportResult> execute3(Long contractId,Long periodId ,Integer type) {
         /*封面、支付申请单、付款申请表*/
         ContractInfo contractInfo = this.contractInfoService.getById(contractId);
-        Map<String,String> parent=  this.getSqlOne("select id,wbs_id wbsId,CONCAT(ancestors,',',id) path from  m_wbs_tree_private a  where a.node_name='?' and a.project_id=?",Map.class,tabArr[type],contractInfo.getPId());
-        List<NodeTable> tableList=  this.getSqlList("select p_key_id pkeyId, node_name nodeName ,init_table_name initTableName,html_url htmlUrl  from  m_wbs_tree_private where ancestors like '?%' and LENGTH(html_url)>0 and is_deleted=0 and project_id=? and wbs_id=?",NodeTable.class,parent.get("path"),contractInfo.getPId(),parent.get("wbsId"));
+        Map<String,String> parent=  this.getSqlOne("select id,wbs_id wbsId,CONCAT(ancestors,',',id) path from  m_wbs_tree_private a  where a.node_name=? and a.project_id=?",Map.class,tabArr[type],contractInfo.getPId());
+        List<NodeTable> tableList=  this.getSqlList("select p_key_id pkeyId, node_name nodeName ,init_table_name initTableName,html_url htmlUrl  from  m_wbs_tree_private where ancestors like ? and LENGTH(html_url)>0 and is_deleted=0 and project_id=? and wbs_id=?",NodeTable.class,parent.get("path")+"%",contractInfo.getPId(),parent.get("wbsId"));
         Map<String,Map<String,String>> coordinateMap=tableList.stream().collect(Collectors.toMap(NodeTable::getInitTableName,m->FormulaUtils.getElementCell(m.getHtmlUrl()),(v1,v2)->v2));
         List<FormData> processFds = this.createFormDataByTableName(String.join(",", ""));
         listForMeter(processFds,contractInfo.getPId(),parent.get("id"));