审批

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

@@ -1,6 +1,8 @@
 package com.iamberry.rst.faces.approval;
 
 import com.iamberry.rst.core.approval.ApplyPick;
+import com.iamberry.rst.core.page.PageRequest;
+import com.iamberry.rst.core.page.PagedResult;
 
 import java.util.List;
 
@@ -16,6 +18,14 @@ public interface ApplyPickService {
      * @return List
      */
     List<ApplyPick> getApplyPickList(ApplyPick  applyPick);
+
+    /**
+     * 分页集合
+     * @param pageRequest
+     * @return
+     */
+    PagedResult<ApplyPick> listApplyPickPage(PageRequest<ApplyPick> pageRequest);
+
     /**
      * 查询单条数据
      * @param  id

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

@@ -1,8 +1,13 @@
 package com.iamberry.rst.service.approval;
 
+import com.github.pagehelper.PageHelper;
 import com.iamberry.rst.core.approval.ApplyPick;
+import com.iamberry.rst.core.page.PageRequest;
+import com.iamberry.rst.core.page.PagedResult;
+import com.iamberry.rst.core.pts.PtsMachine;
 import com.iamberry.rst.faces.approval.ApplyPickService;
 import com.iamberry.rst.service.approval.mapper.ApplyPickMapper;
+import com.iamberry.rst.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -26,6 +31,15 @@ public class ApplyPickServiceImpl  implements ApplyPickService {
     public List<ApplyPick> getApplyPickList(ApplyPick  applyPick){
         return  applyPickMapper.getApplyPickList(applyPick);
     }
+
+
+    @Override
+    public PagedResult<ApplyPick> listApplyPickPage(PageRequest<ApplyPick> pageRequest) {
+        PageHelper.startPage(pageRequest.getPageNO(), pageRequest.getPageSize(), pageRequest.isPageTotal());
+        List<ApplyPick> list = applyPickMapper.getApplyPickList(pageRequest.getData());
+        return PageUtil.getPage(list);
+    }
+
     /**
      * 查询单条数据
      * @param  id

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

@@ -0,0 +1,72 @@
+package com.iamberry.rst.controllers.approval;
+
+import com.iamberry.rst.core.address.Province;
+import com.iamberry.rst.core.approval.ApplyPick;
+import com.iamberry.rst.core.page.PageRequest;
+import com.iamberry.rst.core.page.PagedResult;
+import com.iamberry.rst.core.pts.PtsMachine;
+import com.iamberry.rst.faces.approval.ApplyPickItemService;
+import com.iamberry.rst.faces.approval.ApplyPickService;
+import com.iamberry.rst.utils.StitchAttrUtil;
+import com.iamberry.wechat.tools.ResponseJson;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+
+@Controller
+@RequestMapping("/admin/applyPick")
+public class ApplyPickController {
+
+    @Autowired
+    private ApplyPickService applyPickService;
+    @Autowired
+    private ApplyPickItemService applyPickItemService;
+
+
+    /**
+     *
+     * @param applyPick
+     * @param pageSize
+     * @param pageNO
+     * @param totalNum
+     * @return
+     * @throws Exception
+     */
+    @ResponseBody
+    @RequestMapping(value = "/applyPickList")
+    public ResponseJson listApplyPickPage(
+            ApplyPick applyPick,
+            @RequestParam(value = "pageSize", defaultValue = "10", required = false) Integer pageSize,
+            @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);
+
+        PagedResult<ApplyPick> pagedResult = applyPickService.listApplyPickPage(new PageRequest<ApplyPick>(applyPick, pageNO, pageSize, totalNum == null));
+        if (totalNum != 0) {
+            pagedResult.setTotal(totalNum);
+        }
+        List<ApplyPick> applyPickList = pagedResult.getDataList();
+        rj.addResponseKeyValue("applyPickList",applyPickList);
+        return rj;
+    }
+
+
+    @ResponseBody
+    @RequestMapping(value = "/addApplyPick")
+    public ResponseJson addApplyPick(
+            ApplyPick applyPick) throws Exception {
+        ResponseJson rj =new ResponseJson(200, "修改成功", 200);
+        Integer flag = applyPickService.save(applyPick);
+        if (flag < 1) {
+            return  ResponseJson.getFAILURE();
+        }
+        return rj;
+    }
+
+
+
+}

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

@@ -113,7 +113,7 @@
 		<typeAlias type="com.iamberry.rst.core.cm.InventoryLog" alias="InventoryLog"/>
 		<typeAlias type="com.iamberry.rst.core.cm.InventoryInfo" alias="InventoryInfo"/>
 		<typeAlias type="com.iamberry.rst.core.cm.WarehouseInfo" alias="WarehouseInfo"/>
-		<typeAlias type="com.iamberry.rst.core.approval.FactoryInfo" alias="FactoryInfo"/>
+		<typeAlias type="com.iamberry.rst.core.cm.FactoryInfo" alias="FactoryInfo"/>
 		<!-- 审批实体类 -->
 		<typeAlias type="com.iamberry.rst.core.approval.ApprovalOrderInfo" alias="ApprovalOrderInfo"/>
 		<typeAlias type="com.iamberry.rst.core.approval.ApprovalOrderItem" alias="ApprovalOrderItem"/>