细节优化

src/main/java/com/vverp/controller/admin/AddressController.java

@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 /**
  * 地址解析
  *
- * @author dealsky
+ * @author 
  * @date 2020/7/29 2:59 下午
  */
 @RequestMapping("/admin/address")

src/main/java/com/vverp/controller/admin/BankController.java

@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import javax.annotation.Resource;
 
 /**
- * @author dealsky
+ * @author
  * @date 2020/8/28 9:48 上午
  */
 @Controller("adminBankController")

src/main/java/com/vverp/controller/admin/CommonController.java

@@ -23,7 +23,7 @@ import java.io.IOException;
 import java.math.BigDecimal;
 
 /**
- * @author dealsky
+ * @author
  */
 @Controller("adminCommonController")
 @RequestMapping("/admin/common")

src/main/java/com/vverp/controller/admin/DepartmentController.java

@@ -18,7 +18,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * @author dealsky
+ * @author
  * @date 2020/3/11 9:34 上午
  */
 @Controller("adminDepartmentController")

src/main/java/com/vverp/controller/admin/ExcelController.java

@@ -5,7 +5,7 @@ import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 /**
- * @author dealsky
+ * @author 
  * @date 2020/4/2 3:02 下午
  */
 @Controller("adminExcelController")

src/main/java/com/vverp/controller/admin/ExcelTemplateController.java

@@ -18,7 +18,7 @@ import java.io.IOException;
 import java.util.regex.Matcher;
 
 /**
- * @author dealsky
+ * @author
  * @date 2020/4/8 2:47 下午
  */
 @Controller("adminExcelTemplateController")

src/main/java/com/vverp/controller/admin/ExtraFieldController.java

@@ -21,7 +21,7 @@ import javax.annotation.Resource;
 import java.util.*;
 
 /**
- * @author dealsky
+ * @author 
  * @date 2020/3/11 8:38 下午
  */
 @Controller("adminExtraFieldController")

src/main/java/com/vverp/controller/admin/FormStorageController.java

@@ -12,7 +12,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * @author dealsky
+ * @author
  */
 @Controller
 @RequestMapping("/admin/formStorage")

src/main/java/com/vverp/controller/admin/GenerateSettingController.java

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import javax.annotation.Resource;
 
 /**
- * @author dealsky
+ * @author
  * @date 2021-07-02 14:09
  */
 @Controller

src/main/java/com/vverp/controller/admin/HomeController.java

@@ -1,14 +1,13 @@
 package com.vverp.controller.admin;
 
 import com.vverp.entity.*;
-import com.vverp.moli.util.Page;
-import com.vverp.moli.util.Pageable;
-import com.vverp.util.DateUtil;
 import com.vverp.enums.ApprovalSource;
 import com.vverp.enums.Reservoir;
-import com.vverp.moli.util.Filter;
 import com.vverp.moli.util.Order;
+import com.vverp.moli.util.Page;
+import com.vverp.moli.util.Pageable;
 import com.vverp.service.*;
+import com.vverp.util.DateUtil;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -18,7 +17,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 
 /**
- * @author dealsky
+ * @author
  * @date 2020/9/30 11:12 上午
  */
 @Controller("adminHomeController")

src/main/java/com/vverp/controller/admin/ImportController.java

@@ -16,7 +16,7 @@ import java.util.List;
 /**
  * 导入相关文件
  *
- * @author dealsky
+ * @author
  * @date 2020/12/3 上午11:54
  */
 @Controller

src/main/java/com/vverp/controller/admin/InformationController.java

@@ -14,7 +14,7 @@ import javax.annotation.Resource;
 import java.util.Date;
 
 /**
- * @author dealsky
+ * @author
  * @date 2020/1/20 2:09 下午
  */
 @Controller("adminInformationController")

src/main/java/com/vverp/controller/admin/MailController.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import javax.annotation.Resource;
 
 /**
- * @author dealsky
+ * @author
  * @date 2021/2/3 下午5:45
  */
 @RequestMapping("admin/mail")

src/main/java/com/vverp/controller/admin/MaterialOrderController.java

@@ -13,12 +13,10 @@ import com.vverp.moli.util.RespData;
 import com.vverp.service.*;
 import com.vverp.util.ExcelImportErrorUtil;
 import org.apache.commons.lang.BooleanUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -26,10 +24,13 @@ import javax.annotation.Resource;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.net.URLEncoder;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
- * @author dealsky
+ * @author
  * @date 2020-03-25 16:50
  */
 @Controller
@@ -185,9 +186,11 @@ public class MaterialOrderController extends BaseController {
         List<AdminPurchase> adminPurchaseList = admin.getAdminPurchaseList();
         List<Long> showList = new ArrayList<>();
         for (AdminPurchase adminPurchase : adminPurchaseList){
-            for (AdminPurchaseProductType adminPurchaseProductType : adminPurchase.getAdminPurchaseProductTypeList()) {
-                showList.add(adminPurchaseProductType.getProductType().getId());
-            }
+//            if(Objects.equals(adminPurchase.getProgressName(), "公司") || Objects.equals(admin.getNowProgress(), adminPurchase.getProgressId())){
+                for (AdminPurchaseProductType adminPurchaseProductType : adminPurchase.getAdminPurchaseProductTypeList()) {
+                    showList.add(adminPurchaseProductType.getProductType().getId());
+                }
+//            }
 //            showList.add(adminPurchase.getProductType().getId());
         }
         CompanyQuery companyQuery = new CompanyQuery();

src/main/java/com/vverp/controller/admin/OrderLogController.java

@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import javax.annotation.Resource;
 
 /**
- * @author dealsky
+ * @author 
  * @date 2020/4/13 9:12 上午
  */
 @Controller("adminOrderLogController")

src/main/java/com/vverp/controller/admin/PaymentApplyController.java

@@ -1,9 +1,11 @@
 package com.vverp.controller.admin;
 
-import com.vverp.util.DateUtil;
 import com.vverp.dto.OrderQuery;
 import com.vverp.dto.PaymentApplyQuery;
-import com.vverp.entity.*;
+import com.vverp.entity.Admin;
+import com.vverp.entity.PaymentApply;
+import com.vverp.entity.PurchaseOrder;
+import com.vverp.entity.Supplier;
 import com.vverp.enums.OrderStatus;
 import com.vverp.enums.Reservoir;
 import com.vverp.moli.util.Filter;
@@ -11,10 +13,10 @@ import com.vverp.moli.util.Message;
 import com.vverp.moli.util.Pageable;
 import com.vverp.moli.util.RespData;
 import com.vverp.service.*;
+import com.vverp.util.DateUtil;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -26,7 +28,7 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * @author dealsky
+ * @author
  * @date 2020/6/14 5:13 下午
  */
 @Controller("adminPaymentApplyController")

src/main/java/com/vverp/controller/admin/PaymentMethodController.java

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import javax.annotation.Resource;
 
 /**
- * @author dealsky
+ * @author
  * @date 2020/4/26 11:11 上午
  */
 @Controller("adminPaymentMethodController")

src/main/java/com/vverp/controller/admin/PrintSettingController.java

@@ -1,7 +1,9 @@
 package com.vverp.controller.admin;
 
 import com.vverp.annotation.Module;
-import com.vverp.entity.*;
+import com.vverp.entity.PrintSetting;
+import com.vverp.entity.PurchaseOrder;
+import com.vverp.entity.PurchaseStock;
 import com.vverp.moli.util.RespData;
 import com.vverp.service.PrintSettingService;
 import com.vverp.service.TableStorageService;
@@ -19,7 +21,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * @author dealsky
+ * @author
  * @date 2020/4/24 9:46 上午
  */
 @Controller("adminPrintSettingController")

src/main/java/com/vverp/controller/admin/ProductTypeController.java

@@ -15,7 +15,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * @author dealsky
+ * @author 
  * @date 2020/3/11 9:34 上午
  */
 @Controller("adminProductTypeController")

src/main/java/com/vverp/controller/admin/PurchaseApplyOrderController.java

@@ -1,36 +1,29 @@
 package com.vverp.controller.admin;
 
-import com.vverp.config.wx.TemplateMessageContract;
-import com.vverp.constant.MainConstant;
 import com.vverp.dto.OrderQuery;
-import com.vverp.dto.TemplateDTO;
 import com.vverp.entity.*;
-import com.vverp.enums.ContractType;
-import com.vverp.enums.DeliveryType;
 import com.vverp.enums.OrderCategory;
-import com.vverp.enums.OrderStatus;
-import com.vverp.moli.util.*;
+import com.vverp.moli.util.Message;
+import com.vverp.moli.util.Pageable;
+import com.vverp.moli.util.RespData;
 import com.vverp.service.*;
-import com.vverp.util.Amount2RMB;
-import com.vverp.util.CreatePageUtil;
-import com.vverp.util.DateUtil;
 import org.apache.commons.lang.BooleanUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
- * @author dealsky
+ * @author
  * @date 2020-03-25 16:50
  */
 @Controller

src/main/java/com/vverp/controller/admin/PurchaseOrderController.java

@@ -1,13 +1,19 @@
 package com.vverp.controller.admin;
 
-import com.vverp.util.DateUtil;
 import com.vverp.dto.OrderQuery;
 import com.vverp.entity.*;
-import com.vverp.enums.*;
-import com.vverp.moli.util.*;
+import com.vverp.enums.ContractType;
+import com.vverp.enums.DeliveryType;
+import com.vverp.enums.OrderCategory;
+import com.vverp.enums.OrderStatus;
+import com.vverp.moli.util.Message;
+import com.vverp.moli.util.Page;
+import com.vverp.moli.util.Pageable;
+import com.vverp.moli.util.RespData;
 import com.vverp.service.*;
 import com.vverp.util.Amount2RMB;
 import com.vverp.util.CreatePageUtil;
+import com.vverp.util.DateUtil;
 import org.apache.commons.lang.BooleanUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
@@ -23,7 +29,7 @@ import java.math.RoundingMode;
 import java.util.*;
 
 /**
- * @author dealsky
+ * @author
  * @date 2020-03-25 16:50
  */
 @Controller

src/main/java/com/vverp/controller/admin/PurchaseStockController.java

@@ -1,14 +1,16 @@
 package com.vverp.controller.admin;
 
 import com.vverp.dto.OrderQuery;
-import com.vverp.entity.*;
+import com.vverp.entity.Admin;
+import com.vverp.entity.PurchaseOrder;
+import com.vverp.entity.PurchaseStock;
+import com.vverp.entity.Supplier;
 import com.vverp.enums.OrderCategory;
 import com.vverp.moli.util.Message;
 import com.vverp.moli.util.Page;
 import com.vverp.moli.util.Pageable;
 import com.vverp.moli.util.RespData;
 import com.vverp.service.*;
-import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,7 +24,7 @@ import java.math.BigDecimal;
 import java.util.*;
 
 /**
- * @author dealsky
+ * @author
  * @date 2020/2/24 2:37 下午
  */
 @Controller("adminPurchaseStockController")

src/main/java/com/vverp/controller/admin/ResendMessageController.java

@@ -4,7 +4,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 /**
- * @author dealsky
+ * @author
  * @date 2021-06-30 10:47
  */
 @Controller

src/main/java/com/vverp/controller/admin/SnPrefixController.java

@@ -1,7 +1,9 @@
 package com.vverp.controller.admin;
 
 import com.vverp.annotation.Module;
-import com.vverp.entity.*;
+import com.vverp.entity.PurchaseOrder;
+import com.vverp.entity.PurchaseStock;
+import com.vverp.entity.SnPrefix;
 import com.vverp.moli.util.RespData;
 import com.vverp.service.SnPrefixService;
 import org.apache.commons.lang.StringUtils;
@@ -11,10 +13,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
- * @author dealsky
+ * @author
  * @date 2020/3/11 8:38 下午
  */
 @Controller("adminSnPrefixController")

src/main/java/com/vverp/controller/admin/SystemController.java

@@ -2,10 +2,15 @@ package com.vverp.controller.admin;
 
 import com.vverp.base.Setting;
 import com.vverp.dto.OrderCalendar;
-import com.vverp.entity.*;
+import com.vverp.entity.PaymentMethod;
+import com.vverp.entity.PaymentMethodItem;
+import com.vverp.entity.PurchaseOrder;
+import com.vverp.entity.SystemSetting;
 import com.vverp.moli.util.Filter;
 import com.vverp.moli.util.RespData;
-import com.vverp.service.*;
+import com.vverp.service.PaymentMethodService;
+import com.vverp.service.PurchaseOrderService;
+import com.vverp.service.SystemSettingService;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -15,7 +20,7 @@ import javax.annotation.Resource;
 import java.util.*;
 
 /**
- * @author dealsky
+ * @author
  * @date 2020/2/13 8:54 下午
  */
 @Controller

src/main/java/com/vverp/controller/admin/TableStorageController.java

@@ -13,7 +13,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * @author dealsky
+ * @author
  */
 @Controller
 @RequestMapping("/tableStorage")