审批系统开发

watero-rst-core/src/main/java/com.iamberry.rst.core/approval/ApprovalInfo.java

@@ -25,6 +25,7 @@ public class ApprovalInfo implements Serializable{
     private ApprovalApplyPick approvalApplyPick;//提货申请集合
     private List<ApprovalProductionContract> listProductionContract;//审批合同集合
     private Integer approvalAdminId;//审核人adminid
+    private Integer selectType;//查询类型 1.我发起的 2.我审核的 3.仓库确认
 
     public Integer getApprovalId() {
         return approvalId;
@@ -145,4 +146,12 @@ public class ApprovalInfo implements Serializable{
     public void setApprovalAdminId(Integer approvalAdminId) {
         this.approvalAdminId = approvalAdminId;
     }
+
+    public Integer getSelectType() {
+        return selectType;
+    }
+
+    public void setSelectType(Integer selectType) {
+        this.selectType = selectType;
+    }
 }

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

@@ -284,6 +284,9 @@
       <if test="approvalAdminId != null and approvalAdminId != ''">
         AND hr.admin_id = #{approvalAdminId}
       </if>
+      <if test="selectType != null and selectType != '' and selectType == 3">
+        AND ai.approval_status in (5,6,7,8)
+      </if>
     </where>
   </select>
 

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

@@ -151,7 +151,7 @@ public class ApprovalController {
  * @param pageSize
  * @param pageNO
  * @param totalNum
- * @param selectType 1.我发起的 2.我审核的
+ * @param selectType 1.我发起的 2.我审核的 3.仓库确认
  * @return
  * @throws Exception
  */
@@ -164,7 +164,8 @@ public class ApprovalController {
             @RequestParam(value = "totalNum", defaultValue = "0", required = false) Integer totalNum) throws Exception {
         ResponseJson rj =new ResponseJson(200, "查询成功", 200);
         //获取openid,根据openid查询当前登录人信息
-        String openId = WechatUtils.getUserBySession(request).getUserOpenid();
+        /*String openId = WechatUtils.getUserBySession(request).getUserOpenid();*/
+        String openId = "oaH_GwObiozJFBypUg0wKJjQpBiU";
         Admin admin = sysService.getByOpenid(openId);
         if(admin == null){
             return new ResponseJson(200, "未查询到登录人信息", 500);