自动解析

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/TaskSplitMapper.xml

@@ -19,11 +19,12 @@
         <result column="tool_count" property="toolCount"/>
         <result column="finished" property="finished"/>
         <result column="task_name" property="taskName"/>
+        <result column="data_type" property="dataType"/>
     </resultMap>
 
 
     <select id="selectTaskSplitPage" resultMap="taskSplitResultMap">
-        select * from u_task_split where is_deleted = 0 and contract_id = #{taskSplit.contractId}
+        select * from u_task_split where is_deleted = 0 and contract_id = #{taskSplit.contractId} and data_type=#{taskSplit.dataType}
     </select>
 
     <select id="getArchiveCount" resultType="java.lang.Integer">

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

@@ -875,7 +875,8 @@ public class FormulaController {
     //根据项目ID判断是否是水利项目
     @GetMapping("/isWaterProject")
     public R<Boolean> isWaterProject(@NotNull(message = "projectId 不能为空") Long projectId){
-        return R.data(this.service.isWaterProject(projectId));
+        Boolean waterProject = this.service.isWaterProject(projectId);
+        return R.data(waterProject);
     }
 
     //节点同步工序资料(JS107)

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

@@ -5914,7 +5914,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
 
 
     @Override
-    public R<Object> evaluate(Long pkeyId) {
+    public R evaluate(Long pkeyId) {
         if (StringUtils.isNumber(pkeyId)) {
             /*节点信息*/
             WtcEva wtcEva = this.getSqlOne(
@@ -5968,7 +5968,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                                     xm.setName(name);
                                     xm.setSubItem(info.getTitle());
 
-                                    if(name.contains("△")){
+                                    if(name.contains("△")||name.contains("Δ")){
                                         xm.setWeight(2);
                                     }else{
                                         xm.setWeight(1);
@@ -6178,7 +6178,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                 }
             } catch (Exception e) {
                 e.printStackTrace();
-                return R.data("暂无数据");
+                return R.fail("暂无数据");
             }
         }
         return R.fail("无数据");
@@ -6250,6 +6250,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
         }
         return remap;
     }
+
     public Map<String, String> getWtpParent(String meterType, String projectId) {
         Map<String, Object> map = this.jdbcTemplate.queryForMap("select id,wbs_id wbsId,CONCAT(ancestors_p_id,',',p_key_id) path from  m_wbs_tree_private a  where a.node_name=? and a.project_id=?", meterType, projectId);
         Map<String, String> result = new HashMap<>();