|
@@ -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) >= t.min_num and ifnull(a.hour_num,0) <= t.max_num
|
|
|
- LEFT JOIN pdm_examine_role_detail d on t.id=d.target_id and ifnull(a.hour_num,0)>= d.min_num and ifnull(a.hour_num,0) <= 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">
|