Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-service/src/main/java/com/iamberry/rst/service/approval/mapper/approvalOrderMapper.xml

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/mapper/approvalOrderMapper.xml

@@ -338,6 +338,7 @@
         to_days(#{approvalCreateTime}) = to_days(ai.approval_create_time)
       </if>
     </where>
+    ORDER BY approval_id DESC
   </select>
 
   <!--查询生产审批信息-->
@@ -612,17 +613,17 @@
        hr.approval_id = #{approvalId}
   </select>
 
-  <select id="listProcessInfoByRecordId" parameterType="Integer" resultType="ProcessInfo">
-    SELECT
-    process_id processId,
-    approval_id approvalId,
-    admin_id adminId,
-    record_id recordId,
-    process_desc processDesc,
-    process_state processState,
-    process_create_time processCreateTime
-    from tb_rst_process_info
-    where
-      record_id = #{recordId}
-  </select>
+    <select id="listProcessInfoByRecordId" parameterType="Integer" resultType="ProcessInfo">
+        SELECT
+        process_id processId,
+        approval_id approvalId,
+        admin_id adminId,
+        record_id recordId,
+        process_desc processDesc,
+        process_state processState,
+        process_create_time processCreateTime
+        from tb_rst_process_info
+        where
+        record_id = #{recordId}
+    </select>
 </mapper>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/approval/ApprovalController.java

@@ -12,6 +12,7 @@ import com.iamberry.rst.faces.approval.ApprovalOrderService;
 import com.iamberry.rst.faces.approval.ApprovalProductionService;
 import com.iamberry.rst.faces.approval.ApprovalTaskService;
 import com.iamberry.rst.faces.sys.SysService;
+import com.iamberry.rst.utils.StitchAttrUtil;
 import com.iamberry.wechat.core.entity.WechatUtils;
 import com.iamberry.wechat.file.FileType;
 import com.iamberry.wechat.tools.ResponseJson;
@@ -331,7 +332,7 @@ public class ApprovalController {
     public ResponseJson listApprovalInfo(HttpServletRequest request,
             ApprovalInfo approvalInfo,Integer selectType,
             @RequestParam(value = "pageSize", defaultValue = "10", required = false) Integer pageSize,
-            @RequestParam(value = "pageNO", defaultValue = "1", required = false) Integer pageNO,
+            @RequestParam(value = "pageNo", defaultValue = "1", required = false) Integer pageNO,
             @RequestParam(value = "totalNum", defaultValue = "0", required = false) Integer totalNum) throws Exception {
         ResponseJson rj =new ResponseJson(200, "查询成功", 200);
         //获取openid,根据openid查询当前登录人信息
@@ -358,8 +359,8 @@ public class ApprovalController {
         if (totalNum != 0) {
             pagedResult.setTotal(totalNum);
         }
-        List<ApprovalInfo> approvalList = pagedResult.getDataList();
-        rj.addResponseKeyValue("approvalList",approvalList);
+        rj.addResponseKeyValue("total", pagedResult.getTotal());
+        rj.addResponseKeyValue("approvalList",pagedResult.getDataList());
         return rj;
     }
 
@@ -381,7 +382,11 @@ public class ApprovalController {
             return  ResponseJson.getFAILURE();
         }
 
-        approvalInfo = approvalOrderService.getApprovalInfoById(approvalInfo.getApprovalId());
+        ApprovalInfo ainfo = approvalOrderService.getApprovalInfoById(approvalInfo.getApprovalId());
+
+        approvalInfo.setApprovalName(ainfo.getApprovalName());
+        approvalInfo.setApprovalType(ainfo.getApprovalType());
+        approvalInfo.setActivitiId(ainfo.getActivitiId());
 
         //获取openid,根据openid查询当前登录人信息
         String openId = WechatUtils.getUserBySession(request).getUserOpenid();
@@ -406,7 +411,9 @@ public class ApprovalController {
         processInfo.setProcessDesc(approvalInfo.getApprovalDetails());//后期在后台添加
         //审批信息封装
         ApprovalInfo info = new ApprovalInfo();
-        info.setApprovalId(approvalInfo.getApprovalId());
+        info.setApprovalId(ainfo.getApprovalId());
+        info.setApprovalType(ainfo.getApprovalType());
+        info.setApprovalName(ainfo.getApprovalName());
         switch (status){
             case 1:
                 //修改审核历史记录状态为已通过

watero-rst-web/src/main/java/com/iamberry/rst/utils/StitchAttrUtil.java

@@ -165,4 +165,5 @@ public class StitchAttrUtil {
         }
     }
 
+
 }