1

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/domain/PdmMaintenanceProcess.java

@@ -6,6 +6,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
+import java.util.List;
+
 /**
  * 检修计划全流程管理对象 pdm_maintenance_process
  *
@@ -89,24 +91,26 @@ public class PdmMaintenanceProcess extends BaseEntity
     private String approveFileName;
     @Excel(name = "审批方案地址")
     private String hourNum;
-    @Excel(name = "党政一把手考核金额")
-    private String manageAmt;
-    @Excel(name = "分管副经理")
-    private String manageAssistantAmt;
-    @Excel(name = "部室主任考核金额")
-    private String deptDirectorAmt;
-    @Excel(name = "部室分管主任考核金额")
-    private String deptDirectorAssistantAmt;
-    @Excel(name = "部室责任专责考核金额")
-    private String deptManageAmt;
-    @Excel(name = "总负责人考核金额")
-    private String principAmt;
-    @Excel(name = "工作负责人考核金额")
-    private String workPrincipAmt;
-    @Excel(name = "设备主人考核金额")
-    private String ownerAmt;
-
-    @Override
+
+    private List<Double> examiAmount;
+//    @Excel(name = "党政一把手考核金额")
+//    private String manageAmt;
+//    @Excel(name = "分管副经理")
+//    private String manageAssistantAmt;
+//    @Excel(name = "部室主任考核金额")
+//    private String deptDirectorAmt;
+//    @Excel(name = "部室分管主任考核金额")
+//    private String deptDirectorAssistantAmt;
+//    @Excel(name = "部室责任专责考核金额")
+//    private String deptManageAmt;
+//    @Excel(name = "总负责人考核金额")
+//    private String principAmt;
+//    @Excel(name = "工作负责人考核金额")
+//    private String workPrincipAmt;
+//    @Excel(name = "设备主人考核金额")
+//    private String ownerAmt;
+//
+//    @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())

ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmMaintenanceProcessMapper.xml

@@ -29,14 +29,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="hourNum"    column="hour_num"    />
-        <result property="manageAmt"    column="manage_amt"    />
-        <result property="manageAssistantAmt"    column="manage_assistant_amt"    />
+        <result property="examiAmount"    column="exami_Amount"  typeHandler="com.ruoyi.common.handler.ListTypeHandler" javaType="java.util.List" />
+        <!--result property="manageAssistantAmt"    column="manage_assistant_amt"    />
         <result property="deptDirectorAmt"    column="dept_director_amt"    />
         <result property="deptDirectorAssistantAmt"    column="dept_director_assistant_amt"    />
         <result property="deptManageAmt"    column="dept_manage_amt"    />
         <result property="principAmt"    column="princip_amt"    />
         <result property="workPrincipAmt"    column="work_princip_amt"    />
-        <result property="ownerAmt"    column="owner_amt"    />
+        <result property="ownerAmt"    column="owner_amt"    /-->
     </resultMap>
 
     <sql id="selectPdmMaintenanceProcessVo">
@@ -44,8 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectPdmMaintenanceProcessList" parameterType="PdmMaintenanceProcess" resultMap="PdmMaintenanceProcessResult">
-        select a.*,d.manage_amt,d.manage_assistant_amt,d.dept_director_amt,d.dept_director_assistant_amt,d.dept_manage_amt,d.princip_amt,d.work_princip_amt,d.owner_amt from ( <include refid="selectPdmMaintenanceProcessVo"/>
-
+        select a.*,getExamiAmountFun(hour_num,per_hour_households_w)  exami_Amount from ( <include refid="selectPdmMaintenanceProcessVo"/>
         <where>
             <if test="planCode != null  and planCode != ''"> and plan_code like concat('%', #{planCode}, '%')</if>
             <if test="planCodeW != null  and planCodeW != ''"> and plan_code_w like concat('%', #{planCodeW}, '%')</if>
@@ -64,9 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="maintenanceFilePath != null  and maintenanceFilePath != ''"> and maintenance_file_path = #{maintenanceFilePath}</if>
             <if test="approveFilePath != null  and approveFilePath != ''"> and approve_file_path = #{approveFilePath}</if>
         </where>
-        GROUP BY line_code,std_city_org_no,std_county_org_no,std_org_no)a LEFT JOIN pdm_examine_role_target t
-        on ifnull(a.hour_num,0) &gt;= t.min_num and ifnull(a.hour_num,0) &lt;= t.max_num
-        LEFT JOIN pdm_examine_role_detail  d on t.id=d.target_id and  ifnull(a.hour_num,0)&gt;= d.min_num and ifnull(a.hour_num,0) &lt;= d.max_num
+        GROUP BY line_code,std_city_org_no,std_county_org_no,std_org_no)a
     </select>
 
     <select id="selectPdmMaintenanceProcessById" parameterType="Long" resultMap="PdmMaintenanceProcessResult">