修改客户信息

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/WechatUtils.java

@@ -71,12 +71,12 @@ public class WechatUtils {
 	 */
 	public static Member getUserBySession(HttpServletRequest request) {
 
-		Member m = new Member();
+		/*Member m = new Member();
 		m.setUserId(1);
 		m.setUserOpenid("xxx");
 		if(true){
 			return m;
-		}
+		}*/
 
 		//获取一个cookie数组
 		Cookie[] cookies = request.getCookies();

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

@@ -24,6 +24,7 @@ public class ApprovalInfo implements Serializable{
     private ApprovalProduction approvalProduction;//生产审批集合
     private ApprovalApplyPick approvalApplyPick;//提货申请集合
     private List<ApprovalProductionContract> listProductionContract;//审批合同集合
+    private List<HistoricalRecord> listHistoricalRecord;//审批历史信息集合
     private Integer approvalAdminId;//审核人adminid
     private Integer selectType;//查询类型 1.我发起的 2.我审核的 3.仓库确认
 
@@ -154,4 +155,12 @@ public class ApprovalInfo implements Serializable{
     public void setSelectType(Integer selectType) {
         this.selectType = selectType;
     }
+
+    public List<HistoricalRecord> getListHistoricalRecord() {
+        return listHistoricalRecord;
+    }
+
+    public void setListHistoricalRecord(List<HistoricalRecord> listHistoricalRecord) {
+        this.listHistoricalRecord = listHistoricalRecord;
+    }
 }

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

@@ -17,6 +17,7 @@
     <collection property="approvalProduction" column="approval_id" ofType="ApprovalProduction" select="getApprovalProduction"/>
     <collection property="approvalApplyPick" column="approval_id" ofType="ApprovalApplyPick" select="getApplyPick"/>
     <collection property="listProductionContract" column="approval_id" ofType="ApprovalProductionContract" select="listProductionContract"/>
+    <collection property="listHistoricalRecord" column="approval_id" ofType="HistoricalRecord" select="listHistoricalRecord"/>
   </resultMap>
 
   <resultMap id="ApprovalProductionResultMap" type="ApprovalProduction" >
@@ -576,4 +577,18 @@
     where
     ap.approval_id = #{approvalId}
   </select>
+
+  <select id="listHistoricalRecord" parameterType="Integer" resultType="HistoricalRecord">
+    SELECT
+    hr.record_id recordId,
+    hr.approval_id approvalId,
+    hr.admin_id adminId,
+    hr.record_state recordState,
+    hr.task_id taskId,
+    hr.approval_time approvalTime,
+    hr.record_create_time recordCreateTime
+    from tb_rst_historical_record hr
+    where
+       hr.approval_id = #{approvalId}
+  </select>
 </mapper>

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

@@ -66,7 +66,7 @@ public class ApprovalController {
         }
         //获取openid,根据openid查询当前登录人信息
         String openId = WechatUtils.getUserBySession(request).getUserOpenid();
-        /*String openId = "oaH_GwObiozJFBypUg0wKJjQpBiU";*/
+        /*String openId = "oEy-_s5C7LwmLGTpEGfJoecfsYZc";*/
 
         //获取审批任务id
         Map<String, Object> taskinfo = approvalTaskService.salesmanSubmitApply(1);
@@ -104,7 +104,7 @@ public class ApprovalController {
             JSONObject contract = jsonproductionContracts.getJSONObject(i);
             ApprovalProductionContract contractInfo = new ApprovalProductionContract();
             contractInfo.setContractUrl(contract.getString("contractUrl"));
-            contractInfo.setContractName(contract.getString("contractName"));
+            contractInfo.setContractType(contract.getString("contractType"));
             listProductionContract.add(contractInfo);
         }
         boolean returnValue = approvalOrderService.insertApprovalProduction(approvalProduction,listApprovalProductionItem,listProductionContract,taskinfo,openId);
@@ -219,8 +219,10 @@ public class ApprovalController {
                     responseJson.setReturnCode(500);
                 }
             }
+        }else{
+            responseJson.setReturnCode(500);
         }
-        responseJson.setReturnCode(500);
+
         //返回值拼凑
         /*String requurl = req.getContextPath();//获取web项目的路径*/
 
@@ -330,20 +332,20 @@ 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 = "oaH_GwObiozJFBypUg0wKJjQpBiU";
+        String openId = WechatUtils.getUserBySession(request).getUserOpenid();
+        /*String openId = "oaH_GwObiozJFBypUg0wKJjQpBiU";*/
         Admin admin = sysService.getByOpenid(openId);
         if(admin == null){
             return new ResponseJson(200, "未查询到登录人信息", 500);
         }
-        if(selectType == null){
-            return new ResponseJson(200, "参数不完整，缺少查询类型字段", 500);
-        }
-        if(selectType == 1){//我发起的
-            approvalInfo.setAdminId(admin.getAdminId());
-        }else if(selectType == 2){//我审核的
-            approvalInfo.setApprovalAdminId(admin.getAdminId());
+        if(selectType != null){
+            if(selectType == 1){//我发起的
+                approvalInfo.setAdminId(admin.getAdminId());
+            }else if(selectType == 2){//我审核的
+                approvalInfo.setApprovalAdminId(admin.getAdminId());
+            }
         }
+
         PagedResult<ApprovalInfo> pagedResult = approvalOrderService.listApprovalInfo(pageNO, pageSize,approvalInfo,totalNum == null);
 
         if (totalNum != 0) {
@@ -539,7 +541,10 @@ public class ApprovalController {
             return  ResponseJson.getFAILURE();
         }
         List<ApprovalInfo> info = approvalOrderService.getApprovalInfo(approvalInfo);
-        rj.addResponseKeyValue("approvalInfo",info);
+        if(info.size() < 1){
+            return  ResponseJson.getFAILURE();
+        }
+        rj.addResponseKeyValue("approvalInfo",info.get(1));
         return rj;
     }