Merge remote-tracking branch 'origin/master'

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

@@ -1,5 +1,8 @@
 package com.iamberry.rst.core.approval;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
@@ -19,6 +22,8 @@ public class ApprovalProduction implements Serializable {
     private String companyName;//客户公司名称
     private String contactName;//客户联系人姓名
     private String contactTel;//客户联系人电话
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
     private Date productionDeliveryDate;//交付日期
     private String productionDeliveryWay;//交付方式
     private String productionDeliveryDesc;//交付备注

watero-rst-interface/src/main/java/com/iamberry/rst/faces/approval/ApprovalOrderService.java

@@ -22,7 +22,7 @@ public interface ApprovalOrderService {
      * 新增生产审批信息
      * @return
      */
-    Boolean insertApprovalProduction(ApprovalProduction approvalProduction,List<ApprovalProductionItem> listApprovalProductionItem, List<ApprovalProductionContract> productionContracts,Map<String, Object> tasknfo,String openId);
+    boolean insertApprovalProduction(ApprovalProduction approvalProduction,List<ApprovalProductionItem> listApprovalProductionItem, List<ApprovalProductionContract> productionContracts,Map<String, Object> tasknfo,String openId);
     /**
      * 新增生产审批信息产品
      * @return

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/ApprovalOrderServiceImpl.java

@@ -40,7 +40,7 @@ public class ApprovalOrderServiceImpl implements ApprovalOrderService {
 
     @Override
     @Transactional
-    public Boolean insertApprovalProduction(ApprovalProduction approvalProduction,
+    public boolean insertApprovalProduction(ApprovalProduction approvalProduction,
                                             List<ApprovalProductionItem> listApprovalProductionItem,
                                             List<ApprovalProductionContract> productionContracts,
                                             Map<String, Object> tasknfo,
@@ -66,6 +66,7 @@ public class ApprovalOrderServiceImpl implements ApprovalOrderService {
         }
         //添加生产审批信息
         approvalProduction.setApprovalId(approvalInfo.getApprovalId());
+        approvalProduction.setApplicantId(admin.getAdminId());
         approvalProduction.setApplicantOrderNo("订单编号");
         approvalProduction.setApplicantName(admin.getAdminName());
         //申请人ID

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

@@ -93,7 +93,7 @@
   </resultMap>
 
 
-  <resultMap id="ProcessInfoMap" type="ProcessInfo" >
+  <resultMap id="HistoricalRecordMap" type="HistoricalRecord" >
     <id column="record_id" property="recordId" jdbcType="INTEGER" />
     <result column="approval_id" property="approvalId" jdbcType="INTEGER" />
     <result column="admin_id" property="adminId" jdbcType="INTEGER" />
@@ -136,7 +136,7 @@
           )
     VALUES
     (#{approvalId},#{approvalId},#{applicantOrderNo},#{applicantName},#{applicantId}
-    ,#{orderName},#{companyName},#{contactName},#{contactTel,#{productionDeliveryDate
+    ,#{orderName},#{companyName},#{contactName},#{contactTel},#{productionDeliveryDate}
     ,#{productionDeliveryWay},#{productionDeliveryDesc},#{productionState},#{productionPackingWay}
     ,#{productionRemark},NOW())
   </insert>
@@ -411,26 +411,6 @@
     </where>
   </select>
 
-  <select id="getHistoricalRecord" parameterType="HistoricalRecord" 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>
-      <if test="adminId != null and adminId != ''">
-        hr.admin_id = #{adminId}
-      </if>
-      <if test="approvalId != null and approvalId != ''">
-        AND hr.approval_id = #{approvalId}
-      </if>
-    </where>
-  </select>
-
   <select id="listProcessInfo" parameterType="ProcessInfo" resultType="ProcessInfo">
     SELECT
     process_id processId,

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

@@ -26,6 +26,8 @@ import org.springframework.web.multipart.commons.CommonsMultipartFile;
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import java.io.*;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -33,8 +35,9 @@ import java.util.*;
  */
 
 @Controller
-@RequestMapping("/wechat/approval")
+@RequestMapping("/approval")
 public class ApprovalController {
+    @Autowired
     private ApprovalOrderService approvalOrderService;
     @Autowired
     private ApprovalTaskService approvalTaskService;
@@ -49,17 +52,25 @@ public class ApprovalController {
      */
     @ResponseBody
     @RequestMapping(value = "/addApproval")
-    public ResponseJson addApproval(HttpServletRequest request, ApprovalProduction approvalProduction, String productionItems,String productionContracts){
+    public ResponseJson addApproval(HttpServletRequest request, ApprovalProduction approvalProduction, String productionItems,String productionContracts) throws ParseException {
         ResponseJson rj =new ResponseJson(200, "添加成功", 200);
         if (approvalProduction == null || productionItems == null) {
             return  ResponseJson.getFAILURE();
         }
         //获取openid,根据openid查询当前登录人信息
-        String openId = WechatUtils.getUserBySession(request).getUserOpenid();
+        /*String openId = WechatUtils.getUserBySession(request).getUserOpenid();*/
+        String openId = "oaH_GwObiozJFBypUg0wKJjQpBiU";
 
         //获取审批任务id
         Map<String, Object> taskinfo = approvalTaskService.salesmanSubmitApply(1);
 
+        String deliveryDate = request.getParameter("deliveryDate");
+        if(deliveryDate == null ){
+            return  ResponseJson.getFAILURE();
+        }
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        approvalProduction.setProductionDeliveryDate(format.parse(deliveryDate));
+
         //封装生产审批产品项
         List<ApprovalProductionItem> listApprovalProductionItem = new ArrayList<ApprovalProductionItem>();
         JSONArray jsonProductionItems = JSONArray.fromObject(productionItems);
@@ -68,7 +79,6 @@ public class ApprovalController {
             //添加产品项内容
             ApprovalProductionItem approvalProductionItem = new ApprovalProductionItem();
             approvalProductionItem.setItemBrandName(orderItem.getString("itemBrandName"));
-            approvalProductionItem.setProductId(orderItem.getInt("productId"));
             approvalProductionItem.setItemProductName(orderItem.getString("itemProductName"));
             approvalProductionItem.setItemColorName(orderItem.getString("itemColorName"));
             approvalProductionItem.setItemProductNum(orderItem.getInt("itemProductNum"));
@@ -84,9 +94,9 @@ public class ApprovalController {
             JSONObject contract = jsonproductionContracts.getJSONObject(i);
             ApprovalProductionContract contractInfo = new ApprovalProductionContract();
             contractInfo.setContractUrl(contract.getString("contractUrl"));
+            contractInfo.setContractName(contract.getString("contractName"));
             listProductionContract.add(contractInfo);
         }
-
         boolean returnValue = approvalOrderService.insertApprovalProduction(approvalProduction,listApprovalProductionItem,listProductionContract,taskinfo,openId);
         if(!returnValue){
             return  ResponseJson.getFAILURE();

watero-rst-web/src/main/resources/watero-rst-orm.xml

@@ -241,9 +241,11 @@
 
 		<!--<mapper resource="com/iamberry/rst/service/approval/mapper/applyPickItemMapper.xml"/>
 		<mapper resource="com/iamberry/rst/service/approval/mapper/applyPickMapper.xml"/>
-		<mapper resource="com/iamberry/rst/service/approval/mapper/approvalOrderMapper.xml"/>-->
+		-->
 
 		<!--member-->
+		<mapper resource="com/iamberry/rst/service/approval/mapper/approvalOrderMapper.xml"/>
+
 		<mapper resource="com/iamberry/rst/service/member/mapper/memberMapper.xml"/>
 
 		<!--wx -->