修改熏蒸审批信息展示

src/main/java/com/chinaitop/depot/fumigation/controller/FumigationPlanController.java

@@ -127,6 +127,9 @@ public class FumigationPlanController {
             Map<String, Object> pesticide = pesticidePlanService.finddrugNameById(fumigationId);
             modelMap.put("drugName",pesticide.get("drugname"));//获取药剂名称
             modelMap.put("reagentType",pesticide.get("reagenttype"));//获取药剂名称
+
+            List<Map<String, Object>> approvalData = fumigationPlanService.getApprovalList(fumigationId);
+            modelMap.put("auditList",ParameterUtil.slashCapitals(approvalData));//获取用户审批信息
         }
 
         return modelMap;

src/main/java/com/chinaitop/depot/fumigation/mapper/TFumigationPlanMapper.java

@@ -40,4 +40,6 @@ public interface TFumigationPlanMapper {
     List<Map<String,Object>> getFumigationApproveList(Map<String, Object> map);
 
     List<TFumigationPlan> getProcessList(Map<String, Object> map);
+
+    List<Map<String,Object>> getApprovalList(String fumigationId);
 }

src/main/java/com/chinaitop/depot/fumigation/mapper/TFumigationPlanMapper.xml

@@ -1153,7 +1153,7 @@
     <if test="houseId != null" >
       AND plan.house_id = #{houseId,jdbcType=INTEGER}
     </if>
-    order by plan.create_time desc
+    order by approval.create_time desc
   </select>
   <select id="getProcessList" resultMap="BaseResultMap" parameterType="java.util.Map" >
     select
@@ -1178,4 +1178,19 @@
       order by ${orderByClause}
     </if>
   </select>
+
+  <select id="getApprovalList" parameterType="java.lang.String" resultType="java.util.HashMap">
+    SELECT
+        b.id auditId,
+        b.result result,
+        b.task_id task_id,
+        b.task_name task_name,
+        b.from_user_name from_user_name,
+        b.from_department from_department,
+        b.content
+    FROM
+        business_approval b
+    WHERE
+        b.task_id =  #{fumigationId,jdbcType=VARCHAR}
+  </select>
 </mapper>

src/main/java/com/chinaitop/depot/fumigation/service/FumigationPlanService.java

@@ -61,4 +61,10 @@ public interface FumigationPlanService {
     List<TFumigationProcess> getByCodeAndTimes(List<String> cDcsCodes,List<Date> cTimes);
 
     void submit(String id, Integer approvalStatus);
+
+    /**
+     * 查询熏蒸审批信息
+     * @return
+     */
+    List<Map<String,Object>> getApprovalList(String fumigationId);
 }

src/main/java/com/chinaitop/depot/fumigation/service/impl/FumigationPlanServiceImpl.java

@@ -143,4 +143,13 @@ public class FumigationPlanServiceImpl implements FumigationPlanService {
             tFumigationPesticideMapper.updateByPrimaryKey(list.get(0));
         }
     }
+
+    /**
+     * 查询熏蒸审批信息
+     * @return
+     */
+    @Override
+    public List<Map<String,Object>> getApprovalList(String fumigationId) {
+        return tFumigationPlanMapper.getApprovalList(fumigationId);
+    }
 }