yuansh vor 1 Woche
Ursprung
Commit
eefd5b876f

+ 1 - 20
srm-module-code/src/main/java/org/jeecg/modules/purCode/controller/PurAdvanceCommissionController.java

@@ -4,42 +4,23 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
 import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryRuleEnum;
-import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.baseCode.service.ISerialPatternService;
 import org.jeecg.modules.purCode.entity.PurAdvanceCommission;
-import org.jeecg.modules.purCode.entity.PurDeliveryNote;
-import org.jeecg.modules.purCode.entity.PurAdvanceCommission;
-import org.jeecg.modules.purCode.entity.PurPaymentRequest;
 import org.jeecg.modules.purCode.service.IPurAdvanceCommissionService;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
-
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
@@ -102,7 +83,7 @@ public class PurAdvanceCommissionController extends JeecgController<PurAdvanceCo
 		String code = purAdvanceCommission.getBillCode();
 		if (StringUtils.isNotBlank(code)) {
 
-			QueryWrapper<PurAdvanceCommission> queryWrapper = new QueryWrapper();
+			QueryWrapper<PurAdvanceCommission> queryWrapper = new QueryWrapper<>();
 			queryWrapper.eq("bill_code", code);
 			queryWrapper.eq("del_flag", "0");
 

+ 1 - 1
srm-module-code/src/main/java/org/jeecg/modules/purCode/controller/PurInquiryFormController.java

@@ -334,7 +334,7 @@ public class PurInquiryFormController {
     public PurInquiryFormPage getShipByProject(@RequestParam(name = "projectId", required = true) String projectId, HttpServletRequest req) {
 
         //采购询价单
-        QueryWrapper<PurInquiryForm> queryWrapper = new QueryWrapper();
+        QueryWrapper<PurInquiryForm> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("inquiry_project", projectId);
         queryWrapper.eq("del_flag", "0");
         queryWrapper.eq("status", "0");//状态(1-结束,0-询价中)