Przeglądaj źródła

代码整理

Signed-off-by: anderx <312518615@qq.com>
anderx 5 lat temu
rodzic
commit
faabf937d0
52 zmienionych plików z 39 dodań i 89 usunięć
  1. 1 0
      src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java
  2. 1 0
      src/main/java/com/goafanti/admin/bo/AdminCustomerDetailBo.java
  3. 1 0
      src/main/java/com/goafanti/admin/bo/AdminListBo.java
  4. 1 4
      src/main/java/com/goafanti/admin/controller/AdminSuperviserApiController.java
  5. 0 1
      src/main/java/com/goafanti/admin/service/AdminService.java
  6. 0 2
      src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java
  7. 1 0
      src/main/java/com/goafanti/admin/service/impl/NewAdminServiceImpl.java
  8. 0 1
      src/main/java/com/goafanti/common/dao/OrderExamineMapper.java
  9. 0 1
      src/main/java/com/goafanti/common/dao/OrganizationManagementMapper.java
  10. 0 1
      src/main/java/com/goafanti/common/dao/TOrderLogMapper.java
  11. 0 1
      src/main/java/com/goafanti/common/dao/TOrderNewMapper.java
  12. 0 1
      src/main/java/com/goafanti/common/dao/TOrderTaskMapper.java
  13. 0 1
      src/main/java/com/goafanti/common/dao/TTaskHoursMapper.java
  14. 0 1
      src/main/java/com/goafanti/common/dao/TaskProgressMapper.java
  15. 0 1
      src/main/java/com/goafanti/common/dao/TemporaryReceivablesMapper.java
  16. 2 0
      src/main/java/com/goafanti/common/enums/MemberStatus.java
  17. 0 1
      src/main/java/com/goafanti/common/enums/NoticeStatus.java
  18. 0 1
      src/main/java/com/goafanti/common/enums/OrderLogProcess.java
  19. 10 9
      src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml
  20. 1 0
      src/main/java/com/goafanti/common/model/Admin.java
  21. 0 1
      src/main/java/com/goafanti/common/model/NewOrderRefund.java
  22. 0 2
      src/main/java/com/goafanti/common/model/TOrderBillNew.java
  23. 0 4
      src/main/java/com/goafanti/common/task/OrderDunTask.java
  24. 0 3
      src/main/java/com/goafanti/common/task/PatentTask.java
  25. 4 4
      src/main/java/com/goafanti/common/utils/ExcelUtils.java
  26. 0 1
      src/main/java/com/goafanti/common/utils/ExportExcelUtil.java
  27. 0 1
      src/main/java/com/goafanti/common/utils/MobileMessageUtils.java
  28. 1 0
      src/main/java/com/goafanti/contract/controller/AdminContractApiController.java
  29. 1 0
      src/main/java/com/goafanti/contract/controller/UserContractApiController.java
  30. 1 0
      src/main/java/com/goafanti/core/auth/HttpComponentsClientHttpRequestFactoryDigestAuth.java
  31. 0 1
      src/main/java/com/goafanti/core/mybatis/BaseMybatisDao.java
  32. 2 0
      src/main/java/com/goafanti/core/websocket/SystemWebSocketHandler.java
  33. 1 0
      src/main/java/com/goafanti/customer/bo/UserDetailBo.java
  34. 0 1
      src/main/java/com/goafanti/customer/service/CustomerService.java
  35. 0 3
      src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java
  36. 2 0
      src/main/java/com/goafanti/evaluation/controller/UserEvaluationApiController.java
  37. 0 1
      src/main/java/com/goafanti/order/controller/FundManagerOrderApiController.java
  38. 0 1
      src/main/java/com/goafanti/order/controller/OrderChangeApiController.java
  39. 0 3
      src/main/java/com/goafanti/order/service/OrderChangeService.java
  40. 0 2
      src/main/java/com/goafanti/order/service/OrderProjectService.java
  41. 0 5
      src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java
  42. 0 1
      src/main/java/com/goafanti/order/service/impl/OrderBillServiceImpl.java
  43. 4 9
      src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java
  44. 0 1
      src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java
  45. 0 1
      src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java
  46. 1 7
      src/main/java/com/goafanti/order/service/impl/OrderReceivablesServiceImpl.java
  47. 1 4
      src/main/java/com/goafanti/order/service/impl/OrderRefundServiceImpl.java
  48. 1 3
      src/main/java/com/goafanti/order/service/impl/OutsourceOrgServiceImpl.java
  49. 0 1
      src/main/java/com/goafanti/patent/controller/AdminPatentNewApiController.java
  50. 0 2
      src/main/java/com/goafanti/permission/service/impl/NewRoleServiceImpl.java
  51. 2 0
      src/main/java/com/goafanti/report/enums/TimeType.java
  52. 0 1
      src/main/java/com/goafanti/techproject/enums/TaskState.java

+ 1 - 0
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -144,6 +144,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 				"findOrgOwnerAchievementCount",params,pNo, pSize);
 	}
 
+	@SuppressWarnings("unused")
 	@Override
 	public void saveAchievement(Achievement a, String[] keywords) {
 		a.setId(UUID.randomUUID().toString());

+ 1 - 0
src/main/java/com/goafanti/admin/bo/AdminCustomerDetailBo.java

@@ -4,6 +4,7 @@ public class AdminCustomerDetailBo {
 	private String id;
 	private String name;
 	private Integer source;
+	@SuppressWarnings("unused")
 	private String sourceName;
 	private String contacts;
 	private String contactMobile;

+ 1 - 0
src/main/java/com/goafanti/admin/bo/AdminListBo.java

@@ -76,6 +76,7 @@ public class AdminListBo {
 	private String status;
 	
 	/** 用户编号 **/
+	@SuppressWarnings("unused")
 	private String userNo;
 	
 	/** 职务 **/

+ 1 - 4
src/main/java/com/goafanti/admin/controller/AdminSuperviserApiController.java

@@ -7,7 +7,6 @@ import java.util.UUID;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import org.springframework.beans.BeanUtils;
-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.RequestMethod;
@@ -23,7 +22,6 @@ import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
-import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.AdminLocation;
 import com.goafanti.common.utils.PasswordUtil;
@@ -42,8 +40,7 @@ public class AdminSuperviserApiController extends CertifyApiController {
 	private AdminLocationService	adminLocationService;
 	@Resource
 	private UserService				userService;
-	@Autowired
-	private AdminMapper			adminMapper;
+
 	/**管理员列表*/
 	@RequestMapping(value = "/adminList", method = RequestMethod.GET)
 	public Result adminList(AdminListBo alb, String rid,String roleName, String pageNo,

+ 0 - 1
src/main/java/com/goafanti/admin/service/AdminService.java

@@ -9,7 +9,6 @@ import com.goafanti.admin.bo.AdminDetail;
 import com.goafanti.admin.bo.AdminListBo;
 import com.goafanti.common.model.Admin;
 import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.customer.controller.AdminCustomerApiController;
 
 public interface AdminService {
 

+ 0 - 2
src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java

@@ -9,7 +9,6 @@ import java.util.UUID;
 
 import javax.annotation.Resource;
 
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -25,7 +24,6 @@ import com.goafanti.common.dao.AdminLocationMapper;
 import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.dao.UserBusinessMapper;
 import com.goafanti.common.dao.UserLockReleaseMapper;
-import com.goafanti.common.dao.UserMapper;
 import com.goafanti.common.dao.UserRoleMapper;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.UserBusiness;

+ 1 - 0
src/main/java/com/goafanti/admin/service/impl/NewAdminServiceImpl.java

@@ -76,6 +76,7 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
 		return adminMapper.insert(ad);
 	}
 
+	@SuppressWarnings("unused")
 	@Override
 	public int updateByPrimaryKeySelective(Admin ad, List<String> roleIds) {
 		Map<String, Object> params = new HashMap<>();

+ 0 - 1
src/main/java/com/goafanti/common/dao/OrderExamineMapper.java

@@ -4,7 +4,6 @@ import com.goafanti.common.bo.OrderExamineBo;
 import com.goafanti.common.model.OrderExamine;
 import com.goafanti.common.model.OrderExamineExample;
 import java.util.List;
-import java.util.Map;
 
 import org.apache.ibatis.annotations.Param;
 

+ 0 - 1
src/main/java/com/goafanti/common/dao/OrganizationManagementMapper.java

@@ -1,7 +1,6 @@
 package com.goafanti.common.dao;
 
 import java.util.List;
-import java.util.Map;
 
 import com.goafanti.organization.bo.OrganizationListOut;
 import com.goafanti.admin.bo.AdminListBo;

+ 0 - 1
src/main/java/com/goafanti/common/dao/TOrderLogMapper.java

@@ -1,6 +1,5 @@
 package com.goafanti.common.dao;
 
-import com.goafanti.common.model.TOrderDun;
 import com.goafanti.common.model.TOrderLog;
 import com.goafanti.common.model.TOrderLogExample;
 import com.goafanti.order.bo.TOrderLogBo;

+ 0 - 1
src/main/java/com/goafanti/common/dao/TOrderNewMapper.java

@@ -4,7 +4,6 @@ import com.goafanti.common.model.TOrderBillNew;
 import com.goafanti.common.model.TOrderNew;
 import com.goafanti.common.model.TOrderNewExample;
 import com.goafanti.order.bo.OrderListBo;
-import com.goafanti.order.bo.OrderRefundBo;
 import com.goafanti.order.bo.OrderRefundDetailBo;
 import com.goafanti.order.bo.TOrderNewBo;
 

+ 0 - 1
src/main/java/com/goafanti/common/dao/TOrderTaskMapper.java

@@ -6,7 +6,6 @@ import com.goafanti.order.bo.TOrderTaskBo;
 import com.goafanti.order.bo.TOrderTaskDetailBo;
 import com.goafanti.order.bo.TOrderTaskListBo;
 
-import java.util.Collection;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 

+ 0 - 1
src/main/java/com/goafanti/common/dao/TTaskHoursMapper.java

@@ -2,7 +2,6 @@ package com.goafanti.common.dao;
 
 import com.goafanti.common.model.TTaskHours;
 import com.goafanti.common.model.TTaskHoursExample;
-import com.goafanti.order.bo.TOrderNewBo;
 import com.goafanti.order.bo.TOrderTaskListBo;
 
 import java.util.List;

+ 0 - 1
src/main/java/com/goafanti/common/dao/TaskProgressMapper.java

@@ -5,7 +5,6 @@ import com.goafanti.common.model.TaskProgressExample;
 import com.goafanti.order.bo.TOrderTaskListBo;
 import com.goafanti.order.bo.TaskProgressBo;
 
-import java.util.Date;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 

+ 0 - 1
src/main/java/com/goafanti/common/dao/TemporaryReceivablesMapper.java

@@ -4,7 +4,6 @@ import com.goafanti.common.model.TemporaryReceivables;
 import com.goafanti.common.model.TemporaryReceivablesExample;
 import com.goafanti.order.bo.TemporaryReceivablesBo;
 
-import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 

+ 2 - 0
src/main/java/com/goafanti/common/enums/MemberStatus.java

@@ -21,6 +21,7 @@ public enum MemberStatus{
 		}
 	}
 	
+	@SuppressWarnings("unlikely-arg-type")
 	public static MemberStatus getField(String code) {
 		if (containsType(code)) {
 			return status.get(code);
@@ -32,6 +33,7 @@ public enum MemberStatus{
 		return getField(code).getDesc();
 	}
 
+	@SuppressWarnings("unlikely-arg-type")
 	public static boolean containsType(String code) {
 		return status.containsKey(code);
 	}

+ 0 - 1
src/main/java/com/goafanti/common/enums/NoticeStatus.java

@@ -5,7 +5,6 @@ import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
 
-import com.goafanti.order.enums.OrderDunSubject;
 
 public enum NoticeStatus {
 	PATENTINFO(1, "专利申请管理"),

+ 0 - 1
src/main/java/com/goafanti/common/enums/OrderLogProcess.java

@@ -5,7 +5,6 @@ import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
 
-import com.goafanti.order.enums.OrderNewState;
 
 public enum OrderLogProcess {
 //	流程 0发起退单 1提交 2审核 3驳回  4特批 5财务派单 6财务首付 7项目订单派单 8项目派单 9项目完成 10 退单完成 11财务全款 12发起外包 13外包通过 14外包拒绝

+ 10 - 9
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -1025,14 +1025,15 @@
   </select>
   
   <select id="selectOrderTaskAll" resultType="com.goafanti.order.bo.TOrderTaskBo">
-        select a.id,e.contract_no contractNo,a.order_no as orderNo,h.nickname userName,f.name salesmanName,a.outsource_name outsourceName,a.outsource,
-  a.outsource_price outsourcePrice,g.name depName,e.order_status orderStatus,d.name as contacts,d.contact_mobile as contactsMobile,a.main, c.cname,
-  c.sort cSort,a.commodity_name as commodityName,a.commodity_quantity as commodityQuantity,i.price,a.certificate_number as certificateNumber,a.split_super splitSuper,
-  a.commodity_id as commodityId,a.manager_id managerId,a.consultant_id consultantId,a.project_status as projectStatus,a.set_up_amount setUpAmount,
-  a.task_comment as taskComment ,a.commodity_price as commodityPrice, a.task_status as taskStatus,  a.task_receiver as taskReceiver ,a.split_status splitStatus
-  	 from t_order_task a left join business_project b on a.commodity_id=b.id left join t_order_new e on a.order_no=e.order_no
-  	 left join admin f on e.salesman_id=f.id left join department g on e.order_dep=g.id left join user h on e.buyer_id=h.id
-  	 left join business_project i on a.commodity_id=i.id left join business_category c on b.cid=c.id left join admin d on a.task_receiver=d.id
+    select a.id,e.contract_no contractNo,a.order_no as orderNo,h.nickname userName,f.name salesmanName,a.outsource_name outsourceName,a.outsource,
+	  a.outsource_price outsourcePrice,g.name depName,e.order_status orderStatus,d.name as contacts,d.contact_mobile as contactsMobile,a.main, c.cname,
+	  c.sort cSort,a.commodity_name as commodityName,a.commodity_quantity as commodityQuantity,i.price,a.certificate_number as certificateNumber,
+	  a.commodity_id as commodityId,a.manager_id managerId,a.consultant_id consultantId,a.project_status as projectStatus,a.set_up_amount setUpAmount,
+	  a.task_comment as taskComment ,a.commodity_price as commodityPrice, a.task_status as taskStatus,  a.task_receiver as taskReceiver ,
+	  a.split_status splitStatus,a.split_super splitSuper,a.split_aid splitAid,a.split_time splitTime
+	from t_order_task a left join business_project b on a.commodity_id=b.id left join t_order_new e on a.order_no=e.order_no
+  	left join admin f on e.salesman_id=f.id left join department g on e.order_dep=g.id left join user h on e.buyer_id=h.id
+  	left join business_project i on a.commodity_id=i.id left join business_category c on b.cid=c.id left join admin d on a.task_receiver=d.id
   	where a.super_id is null  and  a.order_no= #{orderNo,jdbcType=VARCHAR} order by a.id
   </select>
   
@@ -1381,7 +1382,7 @@ select
     left join department h on e.order_dep=h.id left join (select task_id , sum(already_number) as alreadyNumber from task_progress 
     group by task_id) i on a.id=i.task_id  left join (select order_no,max(name)as name from outsource_organization group by order_no) j 
     on a.order_no=j.order_no left join task_hours_count k on a.id=k.tid and a.task_receiver=k.aid left join t_order_outsource l
-    on a.id=l.tid left join admin ad on ad.id=a.split_aid where e.delete_sign !=1  and e.order_status not in (5,7)  
+    on a.id=l.tid left join admin ad on ad.id=a.split_aid where  e.order_status not in (5,7)  
     and split_status =2 and a.split_super= #{tid} order by split_id
   </select>
     <select id="selectByidGetCname" resultType="java.lang.String">

+ 1 - 0
src/main/java/com/goafanti/common/model/Admin.java

@@ -77,6 +77,7 @@ public class Admin extends BaseModel implements AftUser {
 	/**
 	 * 用户编号
 	 */
+	@SuppressWarnings("unused")
 	private String 				userNo;
 	/**
 	 * 职务

+ 0 - 1
src/main/java/com/goafanti/common/model/NewOrderRefund.java

@@ -2,7 +2,6 @@ package com.goafanti.common.model;
 
 import java.math.BigDecimal;
 import java.util.Date;
-import javax.annotation.Generated;
 
 public class NewOrderRefund {
 

+ 0 - 2
src/main/java/com/goafanti/common/model/TOrderBillNew.java

@@ -3,9 +3,7 @@ package com.goafanti.common.model;
 import java.math.BigDecimal;
 import java.util.Date;
 
-import org.apache.commons.lang3.time.DateFormatUtils;
 
-import com.goafanti.common.constant.AFTConstants;
 
 public class TOrderBillNew {
     /**

+ 0 - 4
src/main/java/com/goafanti/common/task/OrderDunTask.java

@@ -13,11 +13,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.TOrderNewMapper;

+ 0 - 3
src/main/java/com/goafanti/common/task/PatentTask.java

@@ -14,9 +14,6 @@ import javax.mail.MessagingException;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 
 import com.goafanti.admin.service.AdminService;
 import com.goafanti.common.bo.EmailBo;

+ 4 - 4
src/main/java/com/goafanti/common/utils/ExcelUtils.java

@@ -7,12 +7,10 @@ import java.io.InputStream;
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.regex.Pattern;
 
@@ -187,6 +185,7 @@ public class ExcelUtils {
 	
 	
 	
+	@SuppressWarnings("resource")
 	public  Set<OrderReportBo> parseOrderExcel(String excelPath) throws IOException{
 		InputStream excelFile = new FileInputStream(new File(excelPath));
 		XSSFWorkbook wb = new XSSFWorkbook(excelFile);	
@@ -533,7 +532,7 @@ public class ExcelUtils {
      * @author 
      * @date 2018-8-2
      */
-    @SuppressWarnings({"unchecked", "rawtypes"})
+    @SuppressWarnings({"unchecked", "rawtypes", "resource"})
     public void exportExcel2003(String title, String[] headers, Collection<T> dataset, OutputStream out, String pattern) {
         // 声明一个工作薄
         HSSFWorkbook workbook = new HSSFWorkbook();
@@ -689,7 +688,8 @@ public class ExcelUtils {
      * @param sheetName 首个sheet页名
      * @param response
      */
-    public void listToExcel(String[] titles, List<List<Object>> valueList, String fileName, String sheetName, HttpServletResponse response) {
+    @SuppressWarnings({ "resource", "unused" })
+	public void listToExcel(String[] titles, List<List<Object>> valueList, String fileName, String sheetName, HttpServletResponse response) {
         try {
             response.setContentType("application/x-download");
             fileName = URLEncoder.encode(fileName, "UTF-8");

+ 0 - 1
src/main/java/com/goafanti/common/utils/ExportExcelUtil.java

@@ -13,7 +13,6 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.HorizontalAlignment;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.usermodel.XSSFCell;

+ 0 - 1
src/main/java/com/goafanti/common/utils/MobileMessageUtils.java

@@ -15,7 +15,6 @@ public class MobileMessageUtils {
 	private final static String SIGN_NAME = "技淘网";
 	private final static String CLIENT_EXCEPTION = "手机验证码异常:%s";
 
-	@SuppressWarnings("unused")
 	public static String sendMessage(String templateCode, String paramString, String mobile, String accessKey,
 			String accessSecret) {
 

+ 1 - 0
src/main/java/com/goafanti/contract/controller/AdminContractApiController.java

@@ -474,6 +474,7 @@ public class AdminContractApiController extends CertifyApiController {
 	}
 
 	//to update 18
+	@SuppressWarnings("unused")
 	private Result disposeCog(String id, Integer year, String uid, Result res) {
 		Integer latelyYear = orgCognizanceService.selectLatelyRecordYear(uid);
 		if (null != latelyYear && year - latelyYear < SECTION_YEAR) {

+ 1 - 0
src/main/java/com/goafanti/contract/controller/UserContractApiController.java

@@ -257,6 +257,7 @@ public class UserContractApiController extends CertifyApiController {
 	}
 
 	//to udpate 18
+	@SuppressWarnings("unused")
 	private Result disposeCog(String id, Integer year, String uid, Result res) {
 		Integer latelyYear = orgCognizanceService.selectLatelyRecordYear(uid);
 		if (null != latelyYear && year - latelyYear < SECTION_YEAR) {

+ 1 - 0
src/main/java/com/goafanti/core/auth/HttpComponentsClientHttpRequestFactoryDigestAuth.java

@@ -13,6 +13,7 @@ import org.apache.http.protocol.HttpContext;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
  
+@SuppressWarnings("deprecation")
 public class HttpComponentsClientHttpRequestFactoryDigestAuth extends HttpComponentsClientHttpRequestFactory {
 	 
 	public HttpComponentsClientHttpRequestFactoryDigestAuth(HttpClient client) {

+ 0 - 1
src/main/java/com/goafanti/core/mybatis/BaseMybatisDao.java

@@ -22,7 +22,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.core.mybatis.page.MysqlDialect;
 import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.order.bo.NewOrderChangeBo;
 
 @SuppressWarnings({ "unchecked" })
 public class BaseMybatisDao<T> extends SqlSessionDaoSupport {

+ 2 - 0
src/main/java/com/goafanti/core/websocket/SystemWebSocketHandler.java

@@ -30,6 +30,7 @@ public class SystemWebSocketHandler implements WebSocketHandler {
 		LoggerUtils.debug(getClass(), message.getPayload().toString());
 	}
 
+	@SuppressWarnings("unlikely-arg-type")
 	@Override
 	public void handleTransportError(WebSocketSession session, Throwable exception) throws Exception {
 		if (session.isOpen()) {
@@ -38,6 +39,7 @@ public class SystemWebSocketHandler implements WebSocketHandler {
 		LoggerUtils.debug(getClass(), "websocket: " + users.remove(session) + "关闭");
 	}
 
+	@SuppressWarnings("unlikely-arg-type")
 	@Override
 	public void afterConnectionClosed(WebSocketSession session, CloseStatus closeStatus) throws Exception {
 		LoggerUtils.debug(getClass(), "websocket: " + users.remove(session) + "关闭");

+ 1 - 0
src/main/java/com/goafanti/customer/bo/UserDetailBo.java

@@ -3,6 +3,7 @@ package com.goafanti.customer.bo;
 import com.goafanti.common.model.User;
 
 public class UserDetailBo extends User{
+	@SuppressWarnings("unused")
 	private static final long serialVersionUID = -1468630204351166937L;
 	private String createTimes;
 

+ 0 - 1
src/main/java/com/goafanti/customer/service/CustomerService.java

@@ -5,7 +5,6 @@ import java.util.Date;
 import java.util.List;
 import java.util.Set;
 
-import javax.servlet.http.HttpServletResponse;
 
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 

+ 0 - 3
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -3,8 +3,6 @@ package com.goafanti.customer.service.impl;
 import java.lang.reflect.InvocationTargetException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -78,7 +76,6 @@ import com.goafanti.customer.bo.FollowListBo;
 import com.goafanti.customer.bo.LockingReleaseBo;
 import com.goafanti.customer.bo.StatisticBo;
 import com.goafanti.customer.service.CustomerService;
-import com.goafanti.order.bo.TOrderTaskListBo;
 
 @Service
 public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements CustomerService {

+ 2 - 0
src/main/java/com/goafanti/evaluation/controller/UserEvaluationApiController.java

@@ -51,6 +51,7 @@ import com.goafanti.evaluation.service.ValueEvaluationService;
 @RequestMapping(value = "/api/user/evaluate")
 public class UserEvaluationApiController extends BaseApiController {
 
+	@SuppressWarnings("unused")
 	private static final String			GOVERNMENT_LOAN_ROR	= "government_loan_ror";
 	private static final Logger			logger				= LoggerFactory.getLogger(UserEvaluationApiController.class);
 	private static final MathContext	DEFAULT_PRECISION	= new MathContext(4, RoundingMode.HALF_UP);
@@ -556,6 +557,7 @@ public class UserEvaluationApiController extends BaseApiController {
 		return average.divide(new BigDecimal(count == 0 ? 1 : count), 2, RoundingMode.HALF_UP);
 	}
 
+	@SuppressWarnings("unlikely-arg-type")
 	private Long[] calcForecastIncome(List<YearIncome> incomes, BigDecimal growth) {
 		BigDecimal useGrowth = growth.multiply(PERCENTAGE);
 		BigDecimal base = new BigDecimal(incomes.get(0).getIncome());

+ 0 - 1
src/main/java/com/goafanti/order/controller/FundManagerOrderApiController.java

@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.goafanti.common.bo.Result;
-import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.common.model.TOrderBack;
 import com.goafanti.common.model.TOrderBillNew;

+ 0 - 1
src/main/java/com/goafanti/order/controller/OrderChangeApiController.java

@@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RestController;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
-import com.goafanti.common.model.NewOrderRefund;
 import com.goafanti.common.model.OrderRefundInvoice;
 import com.goafanti.common.model.TChangeDun;
 import com.goafanti.common.model.TChangeTask;

+ 0 - 3
src/main/java/com/goafanti/order/service/OrderChangeService.java

@@ -6,12 +6,9 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletResponse;
 
-import com.goafanti.common.bo.Result;
-import com.goafanti.common.model.NewOrderRefund;
 import com.goafanti.common.model.OrderRefundInvoice;
 import com.goafanti.common.model.TChangeDun;
 import com.goafanti.common.model.TChangeTask;
-import com.goafanti.common.model.TOrderNew;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.order.bo.InputNewOrderRefund;
 import com.goafanti.order.bo.NewOderCahngeListBo;

+ 0 - 2
src/main/java/com/goafanti/order/service/OrderProjectService.java

@@ -5,9 +5,7 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
-import com.goafanti.common.model.TOrderTask;
 import com.goafanti.common.model.TTaskHours;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.order.bo.TOrderTaskDetailBo;

+ 0 - 5
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -21,9 +21,7 @@ import com.goafanti.admin.bo.AdminListBo;
 import com.goafanti.common.bo.EmailBo;
 import com.goafanti.common.bo.Error;
 import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.dao.AdminMapper;
-import com.goafanti.common.dao.NoticeMapper;
 import com.goafanti.common.dao.OrganizationManagementMapper;
 import com.goafanti.common.dao.TOrderBackMapper;
 import com.goafanti.common.dao.TOrderBillNewMapper;
@@ -37,7 +35,6 @@ import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.enums.OrderLogProcess;
 import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.Admin;
-import com.goafanti.common.model.Notice;
 import com.goafanti.common.model.TOrderBack;
 import com.goafanti.common.model.TOrderBillNew;
 import com.goafanti.common.model.TOrderBonus;
@@ -49,14 +46,12 @@ import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.common.utils.SendEmailUtil;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
-import com.goafanti.core.mybatis.JDBCIdGenerator;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.order.bo.OrderListBo;
 import com.goafanti.order.bo.TOrderNewBo;
 import com.goafanti.order.enums.ApprovalNewState;
 import com.goafanti.order.enums.BonusSubject;
-import com.goafanti.order.enums.LiquidationNewState;
 import com.goafanti.order.enums.OrderNewState;
 import com.goafanti.order.enums.ProcessStatus;
 import com.goafanti.order.enums.refundState;

+ 0 - 1
src/main/java/com/goafanti/order/service/impl/OrderBillServiceImpl.java

@@ -10,7 +10,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
-import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.TOrderBillNewMapper;
 import com.goafanti.common.dao.TOrderNewMapper;
 import com.goafanti.common.model.TOrderBillNew;

+ 4 - 9
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -8,12 +8,10 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import javax.print.attribute.standard.MediaSize.Other;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.poi.xssf.usermodel.XSSFCell;
@@ -57,7 +55,6 @@ import com.goafanti.common.model.TOrderTask;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.NewOrderChange;
 import com.goafanti.common.model.NewOrderDun;
-import com.goafanti.common.model.NewOrderRefund;
 import com.goafanti.common.utils.DateUtils;
 import com.goafanti.common.utils.ExportExcelUtil;
 import com.goafanti.common.utils.StringUtils;
@@ -82,11 +79,9 @@ import com.goafanti.order.enums.OrderChangeType;
 import com.goafanti.order.enums.OrderNewState;
 import com.goafanti.order.enums.OrderType;
 import com.goafanti.order.enums.ProcessStatus;
-import com.goafanti.order.service.FundManageOrderService;
 import com.goafanti.order.service.NewOrderDunService;
 import com.goafanti.order.service.OrderChangeService;
 import com.goafanti.order.service.OrderNewService;
-import com.goafanti.order.service.OrderProjectService;
 import com.goafanti.order.service.OrderService;
 import com.goafanti.techproject.enums.TaskState;
 
@@ -125,8 +120,6 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	@Autowired
 	private OrderNewService	orderNewService;
 	@Autowired
-	private OrderProjectService	orderProjectService;
-	@Autowired
 	private NewOrderDunService	newOrderDunService;
 	@Autowired
 	private TChangeTaskMapper	TChangeTaskMapper;
@@ -431,14 +424,16 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		Map<Integer, Integer> map=new HashMap<>();
 		for (TOrderTaskBo tOrderTaskBo : tt1) {
 			//处理父子项目关系 将员父项目存储
+			int x=tOrderTaskBo.getId();
 			tOrderTaskBo.setId(null);
 			tOrderTaskBo.setOrderNo(newOrderNo);
 			if(tOrderTaskBo.getSplitStatus()==2) {
 				tOrderTaskBo.setSplitSuper(map.get(tOrderTaskBo.getSplitSuper()));
 			}
-			int y=tOrderTaskMapper.insertSelective(tOrderTaskBo);
+				tOrderTaskMapper.insertSelective(tOrderTaskBo);
+				int y=tOrderTaskBo.getId();
 			if(tOrderTaskBo.getSplitStatus()==1) {
-				map.put(tOrderTaskBo.getId(), y);
+				map.put(x, y);
 			}
 		}
 		for (OutNewOrderDunBo outNewOrderDunBo : td2) {

+ 0 - 1
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -12,7 +12,6 @@ import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;

+ 0 - 1
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -24,7 +24,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.alibaba.druid.sql.ast.statement.SQLIfStatement.Else;
 import com.goafanti.common.bo.Error;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.AdminMapper;

+ 1 - 7
src/main/java/com/goafanti/order/service/impl/OrderReceivablesServiceImpl.java

@@ -3,7 +3,6 @@ package com.goafanti.order.service.impl;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -19,13 +18,11 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.formula.functions.T;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.util.StringUtil;
 import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFCellStyle;
 import org.apache.poi.xssf.usermodel.XSSFRow;
@@ -59,18 +56,14 @@ import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.order.bo.OrderListBo;
-import com.goafanti.order.bo.OrderReportBo;
 import com.goafanti.order.bo.ReceivablesListBo;
-import com.goafanti.order.bo.TOrderBonusBo;
 import com.goafanti.order.bo.TOrderInvoiceBo;
 import com.goafanti.order.bo.TOrderNewBo;
 import com.goafanti.order.bo.TemporaryReceivablesBo;
 import com.goafanti.order.enums.ApprovalNewState;
 import com.goafanti.order.enums.BonusSubject;
 import com.goafanti.order.enums.LiquidationNewState;
-import com.goafanti.order.enums.OrderNewState;
 import com.goafanti.order.enums.ProcessStatus;
-import com.goafanti.order.enums.ProjectNewStage;
 import com.goafanti.order.enums.ReceivablesStatus;
 import com.goafanti.order.enums.TransactionSubject;
 import com.goafanti.order.service.FundManageOrderService;
@@ -351,6 +344,7 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 	
 	
 	
+	@SuppressWarnings("deprecation")
 	@Override
 	public void batchListReceivables(MultipartFile file) {
 		 //获得Workbook工作薄对象

+ 1 - 4
src/main/java/com/goafanti/order/service/impl/OrderRefundServiceImpl.java

@@ -3,10 +3,8 @@ package com.goafanti.order.service.impl;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.goafanti.common.dao.TOrderBillNewMapper;
 import com.goafanti.common.dao.TOrderRefundMapper;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
@@ -16,8 +14,7 @@ import com.goafanti.order.service.OrderRefundService;
 @Service
 public class OrderRefundServiceImpl extends BaseMybatisDao<TOrderRefundMapper> implements OrderRefundService {
 	
-	@Autowired
-	private TOrderBillNewMapper billNewMapper;
+
 
 
 	@SuppressWarnings("unchecked")

+ 1 - 3
src/main/java/com/goafanti/order/service/impl/OutsourceOrgServiceImpl.java

@@ -7,11 +7,9 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
-import org.hibernate.validator.constraints.Mod11Check.ProcessingDirection;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.goafanti.admin.bo.AdminListBo;
 import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.dao.OrganizationManagementMapper;
 import com.goafanti.common.dao.OutsourceOrganizationMapper;
@@ -35,7 +33,7 @@ import com.goafanti.order.enums.ProcessStatus;
 import com.goafanti.order.service.OrderNewService;
 import com.goafanti.order.service.OrderService;
 import com.goafanti.order.service.OutsourceOrgService;
-import com.goafanti.organization.bo.OrganizationListOut;
+
 @Service
 public class OutsourceOrgServiceImpl  extends BaseMybatisDao<TOrderOutsourceMapper> implements OutsourceOrgService {
 	@Autowired

+ 0 - 1
src/main/java/com/goafanti/patent/controller/AdminPatentNewApiController.java

@@ -2,7 +2,6 @@ package com.goafanti.patent.controller;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Date;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;

+ 0 - 2
src/main/java/com/goafanti/permission/service/impl/NewRoleServiceImpl.java

@@ -15,7 +15,6 @@ import org.springframework.stereotype.Service;
 
 import com.goafanti.common.bo.Error;
 import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.dao.AdminLocationMapper;
 import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.dao.ContractTaskLogMapper;
 import com.goafanti.common.dao.OrganizationContactBookMapper;
@@ -35,7 +34,6 @@ import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.Role;
 import com.goafanti.common.model.RolePermission;
 import com.goafanti.common.model.RoleResources;
-import com.goafanti.common.model.TOrderMid;
 import com.goafanti.common.model.UserRole;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;

+ 2 - 0
src/main/java/com/goafanti/report/enums/TimeType.java

@@ -23,6 +23,7 @@ public enum TimeType {
 		}
 	}
 
+	@SuppressWarnings("unlikely-arg-type")
 	public static TimeType getField(String code) {
 		if (containsType(code)) {
 			return status.get(code);
@@ -30,6 +31,7 @@ public enum TimeType {
 		return ZS;
 	}
 
+	@SuppressWarnings("unlikely-arg-type")
 	public static boolean containsType(String code) {
 		return status.containsKey(code);
 	}

+ 0 - 1
src/main/java/com/goafanti/techproject/enums/TaskState.java

@@ -3,7 +3,6 @@ package com.goafanti.techproject.enums;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.goafanti.order.enums.LiquidationNewState;
 
 public enum TaskState {
 	/** 未分配 **/