细节优化

This commit is contained in:
suncz
2024-07-04 10:59:03 +08:00
parent 7faf64dba2
commit ff90040907
294 changed files with 445 additions and 452 deletions

View File

@@ -6,7 +6,7 @@ import java.lang.annotation.Target;
/** /**
* 仅被用作标识延迟更新的字段 * 仅被用作标识延迟更新的字段
* *
* @author dealsky * @author
* @date 2021/1/23 下午2:22 * @date 2021/1/23 下午2:22
*/ */
@Target({ElementType.FIELD}) @Target({ElementType.FIELD})

View File

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
import javax.annotation.Resource; import javax.annotation.Resource;
/** /**
* @author dealsky * @author
* @date 2020/2/14 4:36 下午 * @date 2020/2/14 4:36 下午
*/ */
@Component @Component

View File

@@ -8,7 +8,7 @@ import javax.servlet.http.HttpSessionListener;
import java.util.HashSet; import java.util.HashSet;
/** /**
* @author dealsky * @author
* @date 2021/1/16 下午3:56 * @date 2021/1/16 下午3:56
*/ */
@WebListener @WebListener

View File

@@ -6,7 +6,7 @@ import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.ModelAttribute;
/** /**
* @author dealsky * @author
* @date 2021/4/28 下午1:19 * @date 2021/4/28 下午1:19
*/ */
@ControllerAdvice @ControllerAdvice

View File

@@ -11,7 +11,7 @@ import org.springframework.context.annotation.Configuration;
import javax.annotation.Resource; import javax.annotation.Resource;
/** /**
* @author dealsky * @author
* @date 2021/4/20 上午11:37 * @date 2021/4/20 上午11:37
*/ */
@Configuration @Configuration

View File

@@ -4,7 +4,7 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
/** /**
* @author dealsky * @author
* @date 2021/4/20 上午11:36 * @date 2021/4/20 上午11:36
*/ */
@Component @Component

View File

@@ -1,7 +1,7 @@
package com.vverp.config.wx; package com.vverp.config.wx;
/** /**
* @author dealsky * @author
* @date 2020/9/28 5:40 下午 * @date 2020/9/28 5:40 下午
*/ */
public class TemplateMessageContract { public class TemplateMessageContract {

View File

@@ -9,7 +9,7 @@ import org.springframework.context.annotation.Configuration;
import javax.annotation.Resource; import javax.annotation.Resource;
/** /**
* @author dealsky * @author
* @date 2020/1/15 2:05 下午 * @date 2020/1/15 2:05 下午
*/ */
@Configuration @Configuration

View File

@@ -4,7 +4,7 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
/** /**
* @author dealsky * @author
* @date 2020/1/15 1:56 下午 * @date 2020/1/15 1:56 下午
*/ */
@Component @Component

View File

@@ -5,7 +5,7 @@ import java.util.Arrays;
import java.util.List; import java.util.List;
/** /**
* @author dealsky * @author
* @date 2021/1/7 下午1:53 * @date 2021/1/7 下午1:53
*/ */
public class CompanyConstant { public class CompanyConstant {

View File

@@ -1,7 +1,7 @@
package com.vverp.constant; package com.vverp.constant;
/** /**
* @author dealsky * @author
* @date 2020/11/17 上午10:41 * @date 2020/11/17 上午10:41
*/ */
public class MainConstant { public class MainConstant {

View File

@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import javax.annotation.Resource; import javax.annotation.Resource;
/** /**
* @author dealsky * @author
* @date 2021/4/27 下午5:33 * @date 2021/4/27 下午5:33
*/ */
@Controller @Controller

View File

@@ -1,22 +1,18 @@
package com.vverp.controller; package com.vverp.controller;
import com.vverp.util.DateUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import com.vverp.base.Setting; import com.vverp.base.Setting;
import com.vverp.controller.admin.BaseController; import com.vverp.controller.admin.BaseController;
import com.vverp.entity.*; import com.vverp.entity.*;
import com.vverp.enums.*; import com.vverp.enums.ContractType;
import com.vverp.moli.util.Filter;
import com.vverp.moli.util.Page; import com.vverp.moli.util.Page;
import com.vverp.moli.util.Pageable; import com.vverp.moli.util.Pageable;
import com.vverp.moli.util.RespData; import com.vverp.moli.util.RespData;
import com.vverp.service.*; import com.vverp.service.AdminService;
import com.vverp.util.GetApi; import com.vverp.service.LoginLogService;
import com.vverp.util.MapUtils; import com.vverp.service.PurchaseOrderService;
import com.vverp.util.PasswordUtils; import com.vverp.service.SystemSettingService;
import com.vverp.util.ServerChanUtils; import com.vverp.util.*;
import org.apache.commons.lang.exception.ExceptionUtils; import org.apache.commons.lang.exception.ExceptionUtils;
import org.apache.poi.ss.util.CellAddress; import org.apache.poi.ss.util.CellAddress;
import org.apache.poi.xssf.usermodel.XSSFCell; import org.apache.poi.xssf.usermodel.XSSFCell;
@@ -24,7 +20,6 @@ import org.apache.poi.xssf.usermodel.XSSFRow;
import org.apache.poi.xssf.usermodel.XSSFSheet; import org.apache.poi.xssf.usermodel.XSSFSheet;
import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
@@ -34,11 +29,10 @@ import javax.servlet.http.HttpSession;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*; import java.util.*;
/** /**
* @author dealsky * @author
* @date 2020/8/6 4:00 下午 * @date 2020/8/6 4:00 下午
*/ */
@RestController @RestController

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,7 +1,9 @@
package com.vverp.controller.admin; package com.vverp.controller.admin;
import com.vverp.annotation.Module; 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.moli.util.RespData;
import com.vverp.service.SnPrefixService; import com.vverp.service.SnPrefixService;
import org.apache.commons.lang.StringUtils; 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 org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource; 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 下午 * @date 2020/3/11 8:38 下午
*/ */
@Controller("adminSnPrefixController") @Controller("adminSnPrefixController")

View File

@@ -2,10 +2,15 @@ package com.vverp.controller.admin;
import com.vverp.base.Setting; import com.vverp.base.Setting;
import com.vverp.dto.OrderCalendar; 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.Filter;
import com.vverp.moli.util.RespData; 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.stereotype.Controller;
import org.springframework.ui.ModelMap; import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
@@ -15,7 +20,7 @@ import javax.annotation.Resource;
import java.util.*; import java.util.*;
/** /**
* @author dealsky * @author
* @date 2020/2/13 8:54 下午 * @date 2020/2/13 8:54 下午
*/ */
@Controller @Controller

View File

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

View File

@@ -13,7 +13,7 @@ import java.util.Date;
import java.util.Map; import java.util.Map;
/** /**
* @author dealsky * @author
* @date 2021/5/18 上午11:23 * @date 2021/5/18 上午11:23
*/ */
@RestController("/apiAttachFileController") @RestController("/apiAttachFileController")

View File

@@ -1,11 +1,13 @@
package com.vverp.controller.api; package com.vverp.controller.api;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.vverp.entity.*; import com.vverp.entity.BankAccount;
import com.vverp.entity.Supplier;
import com.vverp.moli.util.Page; import com.vverp.moli.util.Page;
import com.vverp.moli.util.Pageable; import com.vverp.moli.util.Pageable;
import com.vverp.moli.util.RespData; import com.vverp.moli.util.RespData;
import com.vverp.service.*; import com.vverp.service.BankAccountService;
import com.vverp.service.SupplierService;
import com.vverp.util.MapUtils; import com.vverp.util.MapUtils;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@@ -14,7 +16,7 @@ import javax.annotation.Resource;
import java.util.*; import java.util.*;
/** /**
* @author dealsky * @author
* @date 2020/9/17 10:35 上午 * @date 2020/9/17 10:35 上午
*/ */
@RestController("/apiBankAccountController") @RestController("/apiBankAccountController")

View File

@@ -2,14 +2,15 @@ package com.vverp.controller.api;
import com.vverp.base.Setting; import com.vverp.base.Setting;
import com.vverp.moli.util.RespData; import com.vverp.moli.util.RespData;
import com.vverp.service.*; import com.vverp.service.CompanyService;
import com.vverp.service.SupplierService;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
/** /**
* @author dealsky * @author
* @date 2020/10/13 2:08 下午 * @date 2020/10/13 2:08 下午
*/ */
@RestController("apiCommonController") @RestController("apiCommonController")

View File

@@ -19,7 +19,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
* @author dealsky * @author
* @date 2020/5/9 2:21 下午 * @date 2020/5/9 2:21 下午
*/ */
@RestController("apiDepartmentController") @RestController("apiDepartmentController")

View File

@@ -1,16 +1,9 @@
package com.vverp.controller.api; package com.vverp.controller.api;
import com.vverp.entity.Material;
import com.vverp.entity.MaterialOrder;
import com.vverp.entity.PurchaseApplyOrder;
import com.vverp.entity.PurchaseStock;
import com.vverp.moli.util.Page;
import com.vverp.moli.util.Pageable;
import com.vverp.service.*;
import com.vverp.util.DateUtil;
import com.vverp.dto.OrderInfo; import com.vverp.dto.OrderInfo;
import com.vverp.moli.util.RespData; import com.vverp.moli.util.RespData;
import org.springframework.ui.ModelMap; import com.vverp.service.PurchaseOrderService;
import com.vverp.util.DateUtil;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@@ -22,7 +15,7 @@ import java.util.Map;
/** /**
* 首页 * 首页
* *
* @author dealsky * @author
* @date 2020/1/11 3:33 下午 * @date 2020/1/11 3:33 下午
*/ */
@RestController("apiHomeController") @RestController("apiHomeController")

View File

@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
/** /**
* @author dealsky * @author
* @date 2020/1/20 2:14 下午 * @date 2020/1/20 2:14 下午
*/ */
@RestController("apiInformationController") @RestController("apiInformationController")

View File

@@ -15,7 +15,7 @@ import javax.annotation.Resource;
/** /**
* 登录 * 登录
* *
* @author dealsky * @author
* @date 2019/12/21 10:29 上午 * @date 2019/12/21 10:29 上午
*/ */
@RestController("apiLoginController") @RestController("apiLoginController")

View File

@@ -1,6 +1,5 @@
package com.vverp.controller.api; package com.vverp.controller.api;
import com.vverp.util.DateUtil;
import com.vverp.entity.Admin; import com.vverp.entity.Admin;
import com.vverp.entity.Notice; import com.vverp.entity.Notice;
import com.vverp.entity.NoticeEntity; import com.vverp.entity.NoticeEntity;
@@ -10,6 +9,7 @@ import com.vverp.moli.util.RespData;
import com.vverp.service.AdminService; import com.vverp.service.AdminService;
import com.vverp.service.NoticeEntityService; import com.vverp.service.NoticeEntityService;
import com.vverp.service.NoticeService; import com.vverp.service.NoticeService;
import com.vverp.util.DateUtil;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@@ -23,7 +23,7 @@ import java.util.Map;
/** /**
* 消息通知 * 消息通知
* *
* @author dealsky * @author
* @date 2020/1/15 10:21 上午 * @date 2020/1/15 10:21 上午
*/ */
@RestController("apiNoticeController") @RestController("apiNoticeController")

View File

@@ -16,7 +16,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
* @author dealsky * @author
* @date 2020/7/27 3:55 下午 * @date 2020/7/27 3:55 下午
*/ */
@RestController("apiPaymentAccountController") @RestController("apiPaymentAccountController")

View File

@@ -1,13 +1,17 @@
package com.vverp.controller.api; package com.vverp.controller.api;
import com.vverp.util.DateUtil;
import com.vverp.dto.PaymentApplyQuery; import com.vverp.dto.PaymentApplyQuery;
import com.vverp.entity.*; import com.vverp.entity.Admin;
import com.vverp.moli.util.Filter; import com.vverp.entity.Department;
import com.vverp.entity.OrderBase;
import com.vverp.entity.PaymentApply;
import com.vverp.moli.util.Page; import com.vverp.moli.util.Page;
import com.vverp.moli.util.Pageable; import com.vverp.moli.util.Pageable;
import com.vverp.moli.util.RespData; import com.vverp.moli.util.RespData;
import com.vverp.service.*; import com.vverp.service.AdminService;
import com.vverp.service.PaymentApplyService;
import com.vverp.service.PurchaseOrderService;
import com.vverp.util.DateUtil;
import com.vverp.util.MapUtils; import com.vverp.util.MapUtils;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@@ -16,7 +20,7 @@ import javax.annotation.Resource;
import java.util.*; import java.util.*;
/** /**
* @author dealsky * @author
* @date 2020/9/15 4:41 下午 * @date 2020/9/15 4:41 下午
*/ */
@RestController("apiPaymentApplyController") @RestController("apiPaymentApplyController")

View File

@@ -1,16 +1,22 @@
package com.vverp.controller.api; package com.vverp.controller.api;
import com.vverp.util.DateUtil;
import com.vverp.base.Setting; import com.vverp.base.Setting;
import com.vverp.dto.OrderQuery; import com.vverp.dto.OrderQuery;
import com.vverp.entity.*; import com.vverp.entity.Admin;
import com.vverp.entity.Product;
import com.vverp.entity.PurchaseOrder;
import com.vverp.entity.PurchaseOrderItem;
import com.vverp.enums.OrderStatus; import com.vverp.enums.OrderStatus;
import com.vverp.form.OrderForm; import com.vverp.form.OrderForm;
import com.vverp.form.PurchaseOrderForm; import com.vverp.form.PurchaseOrderForm;
import com.vverp.moli.util.Page; import com.vverp.moli.util.Page;
import com.vverp.moli.util.Pageable; import com.vverp.moli.util.Pageable;
import com.vverp.moli.util.RespData; import com.vverp.moli.util.RespData;
import com.vverp.service.*; import com.vverp.service.AdminService;
import com.vverp.service.AttachFileService;
import com.vverp.service.ProductService;
import com.vverp.service.PurchaseOrderService;
import com.vverp.util.DateUtil;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,10 +25,13 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.*; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/** /**
* @author dealsky * @author
* @date 2020/1/10 3:41 下午 * @date 2020/1/10 3:41 下午
*/ */
@RestController("apiPurchaseOrderController") @RestController("apiPurchaseOrderController")

View File

@@ -1,22 +1,19 @@
package com.vverp.controller.api; package com.vverp.controller.api;
import cn.hutool.core.date.DateField;
import com.vverp.util.DateUtil;
import com.vverp.dto.OrderInfo; import com.vverp.dto.OrderInfo;
import com.vverp.entity.*; import com.vverp.entity.Statistic;
import com.vverp.enums.TransportType;
import com.vverp.moli.util.Filter;
import com.vverp.moli.util.RespData; import com.vverp.moli.util.RespData;
import com.vverp.service.*; import com.vverp.service.PurchaseOrderItemService;
import com.vverp.service.PurchaseOrderService;
import com.vverp.service.StatisticService;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.*; import java.util.*;
/** /**
* @author dealsky * @author
* @date 2020/1/13 11:49 上午 * @date 2020/1/13 11:49 上午
*/ */
@RestController("/apiStatisticController") @RestController("/apiStatisticController")

View File

@@ -1,6 +1,5 @@
package com.vverp.controller.api; package com.vverp.controller.api;
import com.vverp.util.DateUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.vverp.dto.BankAccountDTO; import com.vverp.dto.BankAccountDTO;
import com.vverp.dto.ContactDTO; import com.vverp.dto.ContactDTO;
@@ -15,6 +14,7 @@ import com.vverp.moli.util.Pageable;
import com.vverp.moli.util.RespData; import com.vverp.moli.util.RespData;
import com.vverp.service.SupplierService; import com.vverp.service.SupplierService;
import com.vverp.util.CommonDTOParseUtils; import com.vverp.util.CommonDTOParseUtils;
import com.vverp.util.DateUtil;
import com.vverp.util.ParseUtils; import com.vverp.util.ParseUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
@@ -27,7 +27,7 @@ import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
/** /**
* @author dealsky * @author
* @date 2020/1/6 9:37 上午 * @date 2020/1/6 9:37 上午
*/ */
@RestController("apiSupplierController") @RestController("apiSupplierController")

View File

@@ -1,10 +1,10 @@
package com.vverp.controller.api; package com.vverp.controller.api;
import com.vverp.constant.MainConstant; import com.vverp.constant.MainConstant;
import com.vverp.entity.*; import com.vverp.entity.Admin;
import com.vverp.entity.NoticeEntity;
import com.vverp.entity.PaymentApply;
import com.vverp.enums.ApprovalSource; import com.vverp.enums.ApprovalSource;
import com.vverp.enums.ApprovalType;
import com.vverp.enums.TransportSource;
import com.vverp.moli.util.Filter; import com.vverp.moli.util.Filter;
import com.vverp.moli.util.RespData; import com.vverp.moli.util.RespData;
import com.vverp.service.*; import com.vverp.service.*;
@@ -15,7 +15,6 @@ import me.chanjar.weixin.mp.api.WxMpService;
import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage; import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage; import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.exception.ExceptionUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
@@ -29,11 +28,11 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.math.BigDecimal; import java.util.Arrays;
import java.util.*; import java.util.List;
/** /**
* @author dealsky * @author
* @date 2020/1/15 3:10 下午 * @date 2020/1/15 3:10 下午
*/ */
@Controller("apiWxController") @Controller("apiWxController")

View File

@@ -11,7 +11,7 @@ import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root; import javax.persistence.criteria.Root;
/** /**
* @author dealsky * @author
* @date 2020/3/10 2:02 下午 * @date 2020/3/10 2:02 下午
*/ */
@Repository @Repository

View File

@@ -4,7 +4,7 @@ import com.vverp.entity.BankAccount;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
/** /**
* @author dealsky * @author
* @date 2020/3/27 3:18 下午 * @date 2020/3/27 3:18 下午
*/ */
@Repository @Repository

View File

@@ -14,7 +14,7 @@ import javax.persistence.criteria.Root;
import java.io.Serializable; import java.io.Serializable;
/** /**
* @author dealsky * @author
* @date 2020/5/8 1:49 下午 * @date 2020/5/8 1:49 下午
*/ */
public class BaseAttendanceDao<T extends BaseEntity<ID>, ID extends Serializable> extends BaseDao<T, ID> { public class BaseAttendanceDao<T extends BaseEntity<ID>, ID extends Serializable> extends BaseDao<T, ID> {

View File

@@ -12,7 +12,7 @@ import java.io.Serializable;
import java.util.List; import java.util.List;
/** /**
* @author dealsky * @author
* @date 2020/4/21 11:25 上午 * @date 2020/4/21 11:25 上午
*/ */
public class BaseOrderDao<T extends BaseEntity<ID>, ID extends Serializable> extends BaseDao<T, ID> { public class BaseOrderDao<T extends BaseEntity<ID>, ID extends Serializable> extends BaseDao<T, ID> {

View File

@@ -12,7 +12,7 @@ import java.io.Serializable;
import java.util.List; import java.util.List;
/** /**
* @author dealsky * @author
* @date 2020/4/21 11:42 上午 * @date 2020/4/21 11:42 上午
*/ */
public class BaseOrderItemDao<T extends BaseEntity<ID>, ID extends Serializable> extends BaseDao<T, ID> { public class BaseOrderItemDao<T extends BaseEntity<ID>, ID extends Serializable> extends BaseDao<T, ID> {

View File

@@ -4,7 +4,7 @@ import com.vverp.entity.CargoAddress;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
/** /**
* @author dealsky * @author
* @date 2020/4/28 1:30 下午 * @date 2020/4/28 1:30 下午
*/ */
@Repository @Repository

View File

@@ -4,7 +4,7 @@ import com.vverp.entity.Company;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
/** /**
* @author dealsky * @author
* @date 2020/8/6 11:52 上午 * @date 2020/8/6 11:52 上午
*/ */
@Repository @Repository

View File

@@ -4,7 +4,7 @@ import com.vverp.entity.Contact;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
/** /**
* @author dealsky * @author
* @date 2020/3/27 3:17 下午 * @date 2020/3/27 3:17 下午
*/ */
@Repository @Repository

View File

@@ -9,7 +9,7 @@ import javax.persistence.criteria.Root;
import java.util.List; import java.util.List;
/** /**
* @author dealsky * @author
* @date 2020/3/11 4:22 下午 * @date 2020/3/11 4:22 下午
*/ */
@Repository @Repository

View File

@@ -4,7 +4,7 @@ import com.vverp.entity.ExcelTemplate;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
/** /**
* @author dealsky * @author
* @date 2020/4/8 1:50 下午 * @date 2020/4/8 1:50 下午
*/ */
@Repository @Repository

View File

@@ -10,7 +10,7 @@ import javax.persistence.criteria.Root;
import java.util.List; import java.util.List;
/** /**
* @author dealsky * @author
* @date 2020/3/11 8:32 下午 * @date 2020/3/11 8:32 下午
*/ */
@Repository @Repository

View File

@@ -10,7 +10,7 @@ import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root; import javax.persistence.criteria.Root;
/** /**
* @author dealsky * @author
*/ */
@Repository @Repository
public class FormStorageDao extends BaseDao<FormStorage, Long> { public class FormStorageDao extends BaseDao<FormStorage, Long> {

View File

@@ -4,7 +4,7 @@ import com.vverp.entity.GenerateSetting;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
/** /**
* @author dealsky * @author
* @date 2021-07-02 14:09 * @date 2021-07-02 14:09
*/ */
@Repository @Repository

View File

@@ -4,7 +4,7 @@ import com.vverp.entity.Information;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
/** /**
* @author dealsky * @author
* @date 2020/4/13 1:23 下午 * @date 2020/4/13 1:23 下午
*/ */
@Repository @Repository

View File

@@ -1,9 +1,9 @@
package com.vverp.dao; package com.vverp.dao;
import com.vverp.util.DateUtil;
import com.vverp.dto.InvoiceRecordQuery; import com.vverp.dto.InvoiceRecordQuery;
import com.vverp.moli.util.Page; import com.vverp.moli.util.Page;
import com.vverp.moli.util.Pageable; import com.vverp.moli.util.Pageable;
import com.vverp.util.DateUtil;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.hibernate.internal.SQLQueryImpl; import org.hibernate.internal.SQLQueryImpl;
import org.hibernate.transform.PassThroughResultTransformer; import org.hibernate.transform.PassThroughResultTransformer;
@@ -20,7 +20,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
* @author dealsky * @author
* @date 2020/5/15 3:29 下午 * @date 2020/5/15 3:29 下午
*/ */
@Repository @Repository

View File

@@ -4,7 +4,7 @@ import com.vverp.entity.LoginLog;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
/** /**
* @author dealsky * @author
* @date 2021-02-23 17:30 * @date 2021-02-23 17:30
*/ */
@Repository @Repository

View File

@@ -12,7 +12,7 @@ import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root; import javax.persistence.criteria.Root;
/** /**
* @author dealsky * @author
* @date 2019-09-24 17:44 * @date 2019-09-24 17:44
*/ */
@Repository @Repository

View File

@@ -16,7 +16,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
* @author dealsky * @author
* @date 2020-01-15 10:16 * @date 2020-01-15 10:16
*/ */
@Repository @Repository

View File

@@ -4,7 +4,7 @@ import com.vverp.entity.OrderLog;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
/** /**
* @author dealsky * @author
* @date 2020/4/13 9:11 上午 * @date 2020/4/13 9:11 上午
*/ */
@Repository @Repository

View File

@@ -16,7 +16,7 @@ import java.math.BigDecimal;
import java.util.List; import java.util.List;
/** /**
* @author dealsky * @author
* @date 2020/6/14 5:07 下午 * @date 2020/6/14 5:07 下午
*/ */
@Repository @Repository

View File

@@ -4,7 +4,7 @@ import com.vverp.entity.PaymentMethod;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
/** /**
* @author dealsky * @author
* @date 2020/4/26 11:08 上午 * @date 2020/4/26 11:08 上午
*/ */
@Repository @Repository

View File

@@ -4,7 +4,7 @@ import com.vverp.entity.PaymentMethodItem;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
/** /**
* @author dealsky * @author
* @date 2020/4/26 11:10 上午 * @date 2020/4/26 11:10 上午
*/ */
@Repository @Repository

View File

@@ -4,7 +4,7 @@ import com.vverp.entity.PrintSetting;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
/** /**
* @author dealsky * @author
* @date 2020/4/24 9:30 上午 * @date 2020/4/24 9:30 上午
*/ */
@Repository @Repository

View File

@@ -1,8 +1,6 @@
package com.vverp.dao; package com.vverp.dao;
import com.vverp.entity.ProductType; import com.vverp.entity.ProductType;
import com.vverp.util.CriteriaUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaBuilder;
@@ -12,7 +10,7 @@ import javax.persistence.criteria.Root;
import java.util.List; import java.util.List;
/** /**
* @author dealsky * @author
* @date 2020/3/11 9:33 上午 * @date 2020/3/11 9:33 上午
*/ */
@Repository @Repository

View File

@@ -2,7 +2,9 @@ package com.vverp.dao;
import com.vverp.dto.OrderInfo; import com.vverp.dto.OrderInfo;
import com.vverp.dto.OrderQuery; import com.vverp.dto.OrderQuery;
import com.vverp.entity.*; import com.vverp.entity.PurchaseOrder;
import com.vverp.entity.PurchaseOrderItem;
import com.vverp.entity.Supplier;
import com.vverp.moli.util.Page; import com.vverp.moli.util.Page;
import com.vverp.moli.util.Pageable; import com.vverp.moli.util.Pageable;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
@@ -12,7 +14,7 @@ import javax.persistence.criteria.*;
import java.util.Date; import java.util.Date;
/** /**
* @author dealsky * @author
* @date 2020-03-25 16:50 * @date 2020-03-25 16:50
*/ */
@Repository @Repository

View File

@@ -2,8 +2,6 @@ package com.vverp.dao;
import com.vverp.dto.*; import com.vverp.dto.*;
import com.vverp.entity.PurchaseOrderItem; import com.vverp.entity.PurchaseOrderItem;
import com.vverp.moli.util.Page;
import com.vverp.moli.util.Pageable;
import com.vverp.util.CriteriaUtils; import com.vverp.util.CriteriaUtils;
import org.hibernate.internal.SQLQueryImpl; import org.hibernate.internal.SQLQueryImpl;
import org.hibernate.transform.Transformers; import org.hibernate.transform.Transformers;
@@ -19,7 +17,7 @@ import java.util.Date;
import java.util.List; import java.util.List;
/** /**
* @author dealsky * @author
* @date 2020-03-25 16:50 * @date 2020-03-25 16:50
*/ */
@Repository @Repository

View File

@@ -1,6 +1,7 @@
package com.vverp.dao; package com.vverp.dao;
import com.vverp.entity.*; import com.vverp.entity.PurchaseStock;
import com.vverp.entity.PurchaseStockItem;
import com.vverp.moli.util.Page; import com.vverp.moli.util.Page;
import com.vverp.moli.util.Pageable; import com.vverp.moli.util.Pageable;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
@@ -9,7 +10,7 @@ import org.springframework.stereotype.Repository;
import javax.persistence.criteria.*; import javax.persistence.criteria.*;
/** /**
* @author dealsky * @author
* @date 2020/2/24 2:37 下午 * @date 2020/2/24 2:37 下午
*/ */
@Repository @Repository

View File

@@ -4,7 +4,7 @@ import com.vverp.entity.SnEntity;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
/** /**
* @author dealsky * @author
* @date 2020/4/18 3:12 下午 * @date 2020/4/18 3:12 下午
*/ */
@Repository @Repository

View File

@@ -1,9 +1,9 @@
package com.vverp.dao; package com.vverp.dao;
import com.vverp.util.DateUtil;
import com.vverp.entity.SnInfo; import com.vverp.entity.SnInfo;
import com.vverp.service.SnEntityService; import com.vverp.service.SnEntityService;
import com.vverp.service.SnPrefixService; import com.vverp.service.SnPrefixService;
import com.vverp.util.DateUtil;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import javax.annotation.Resource; import javax.annotation.Resource;
@@ -14,7 +14,7 @@ import java.util.Date;
import java.util.List; import java.util.List;
/** /**
* @author dealsky * @author
* @date 2020/3/30 11:47 上午 * @date 2020/3/30 11:47 上午
*/ */
@Repository @Repository

View File

@@ -4,7 +4,7 @@ import com.vverp.entity.SnPrefix;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
/** /**
* @author dealsky * @author
* @date 2020/4/18 12:26 下午 * @date 2020/4/18 12:26 下午
*/ */
@Repository @Repository

View File

@@ -13,7 +13,7 @@ import java.util.Date;
import java.util.List; import java.util.List;
/** /**
* @author dealsky * @author
* @date 2020/3/31 5:31 下午 * @date 2020/3/31 5:31 下午
*/ */
@Repository @Repository

View File

@@ -10,7 +10,7 @@ import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root; import javax.persistence.criteria.Root;
/** /**
* @author dealsky * @author
*/ */
@Repository @Repository
public class TableStorageDao extends BaseDao<TableStorage, Long> { public class TableStorageDao extends BaseDao<TableStorage, Long> {

View File

@@ -3,7 +3,7 @@ package com.vverp.dto;
import java.math.BigDecimal; import java.math.BigDecimal;
/** /**
* @author dealsky * @author
* @date 2019/12/6 10:23 上午 * @date 2019/12/6 10:23 上午
*/ */
public class AddressDTO { public class AddressDTO {

View File

@@ -3,7 +3,7 @@ package com.vverp.dto;
import com.vverp.entity.Admin; import com.vverp.entity.Admin;
/** /**
* @author dealsky * @author
* @date 2020/8/31 2:54 下午 * @date 2020/8/31 2:54 下午
*/ */
public class AdminQuery extends BaseQuery { public class AdminQuery extends BaseQuery {

View File

@@ -5,7 +5,7 @@ import java.math.BigDecimal;
/** /**
* 员工业绩排名 * 员工业绩排名
* *
* @author dealsky * @author
* @date 2020/1/13 3:20 下午 * @date 2020/1/13 3:20 下午
*/ */
public class AdminRankDTO { public class AdminRankDTO {

View File

@@ -1,7 +1,7 @@
package com.vverp.dto; package com.vverp.dto;
/** /**
* @author dealsky * @author
* @date 2021/5/24 下午5:38 * @date 2021/5/24 下午5:38
*/ */
public class AppItemQuery { public class AppItemQuery {

View File

@@ -6,7 +6,7 @@ import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
/** /**
* @author dealsky * @author
* @date 2020/5/8 1:50 下午 * @date 2020/5/8 1:50 下午
*/ */
public class AttendanceQuery extends BaseQuery { public class AttendanceQuery extends BaseQuery {

View File

@@ -1,7 +1,7 @@
package com.vverp.dto; package com.vverp.dto;
/** /**
* @author dealsky * @author
* @date 2020/9/15 2:36 下午 * @date 2020/9/15 2:36 下午
*/ */
public class BankAccountDTO { public class BankAccountDTO {

View File

@@ -3,7 +3,7 @@ package com.vverp.dto;
import java.util.Date; import java.util.Date;
/** /**
* @author dealsky * @author
* @date 2020/4/28 10:04 上午 * @date 2020/4/28 10:04 上午
*/ */
public class BaseQuery { public class BaseQuery {

View File

@@ -6,7 +6,7 @@ import java.util.Date;
import java.util.List; import java.util.List;
/** /**
* @author dealsky * @author
* @date 2020/9/28 11:49 上午 * @date 2020/9/28 11:49 上午
*/ */
public class CalendarMemorandumQuery { public class CalendarMemorandumQuery {

View File

@@ -3,7 +3,7 @@ package com.vverp.dto;
import java.util.Date; import java.util.Date;
/** /**
* @author dealsky * @author
* @date 2020/11/9 4:06 下午 * @date 2020/11/9 4:06 下午
*/ */
public class CargoTransQuery { public class CargoTransQuery {

View File

@@ -3,7 +3,7 @@ package com.vverp.dto;
/** /**
* 通用dao层查询结果封装类 * 通用dao层查询结果封装类
* *
* @author dealsky * @author
* @date 2020/12/17 下午1:34 * @date 2020/12/17 下午1:34
*/ */
public class CommonDaoResult { public class CommonDaoResult {

View File

@@ -3,7 +3,7 @@ package com.vverp.dto;
import java.math.BigDecimal; import java.math.BigDecimal;
/** /**
* @author dealsky * @author
* @date 2020/4/1 10:30 上午 * @date 2020/4/1 10:30 上午
*/ */
public class CommonRankDTO { public class CommonRankDTO {

View File

@@ -1,7 +1,7 @@
package com.vverp.dto; package com.vverp.dto;
/** /**
* @author dealsky * @author
* @date 2020/12/28 下午5:06 * @date 2020/12/28 下午5:06
*/ */
public class CompanyDTO { public class CompanyDTO {

View File

@@ -1,7 +1,7 @@
package com.vverp.dto; package com.vverp.dto;
/** /**
* @author dealsky * @author
* @date 2020/4/28 9:53 上午 * @date 2020/4/28 9:53 上午
*/ */
public class CompanyQuery extends BaseQuery { public class CompanyQuery extends BaseQuery {

View File

@@ -1,7 +1,7 @@
package com.vverp.dto; package com.vverp.dto;
/** /**
* @author dealsky * @author
* @date 2020/9/15 2:27 下午 * @date 2020/9/15 2:27 下午
*/ */
public class ContactDTO { public class ContactDTO {

View File

@@ -5,7 +5,7 @@ import java.math.BigDecimal;
/** /**
* 费用 * 费用
* *
* @author dealsky * @author
* @date 2020/12/17 下午1:47 * @date 2020/12/17 下午1:47
*/ */
public class CostDTO { public class CostDTO {

Some files were not shown because too many files have changed in this diff Show More