Просмотр исходного кода

新增订单项目完成状态

anderx 1 год назад
Родитель
Сommit
661c8e5e50
1 измененных файлов с 5 добавлено и 20 удалено
  1. 5 20
      src/main/java/com/goafanti/common/controller/PublicController.java

+ 5 - 20
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -18,7 +18,6 @@ import com.goafanti.core.mybatis.JDBCIdGenerator;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.core.websocket.SystemWebSocketHandler;
 import com.goafanti.expenseAccount.service.ExpenseAccountService;
-import com.goafanti.order.enums.OrderImgEnums;
 import com.goafanti.order.service.OrderNewService;
 import com.goafanti.order.service.OrderProjectService;
 import com.goafanti.user.service.UserService;
@@ -743,10 +742,7 @@ public class PublicController extends CertifyApiController {
 				}
 				String filePath = uploadPath + "/" + fileName;
 				FileUtils.deleteFile(filePath);
-				if (fileName.contains(OrderImgEnums.CONTRACT.getCode())){
-
-				}
-				res.setData(1);
+                res.setData(1);
 			} catch (Exception e) {
 				LoggerUtils.error(PublicController.class, "删除文件失败", e);
 			}
@@ -774,7 +770,6 @@ public class PublicController extends CertifyApiController {
 
 	/**
 	 * 补充发票报销查询编号
-	 * @return
 	 */
 	@RequestMapping("/supplementCheckNo")
 	public Result supplementCheckNo() {
@@ -785,7 +780,6 @@ public class PublicController extends CertifyApiController {
 
 	/**
 	 * 查询贫困信息
-	 * @return
 	 */
 	@RequestMapping("/selectPoverty")
 	public Result selectPoverty(@RequestParam(value = "file", required = false) MultipartFile file) {
@@ -810,7 +804,6 @@ public class PublicController extends CertifyApiController {
 	 * 查询贫困信息
 	 * @param id 贫困信息编号
 	 * @param type 0=所有 ,1=只看有效数据
-	 * @return
 	 */
 	@RequestMapping("/selectPovertyById/export")
 	public Result selectPovertyByIdExport(String id,Integer type) {
@@ -856,14 +849,12 @@ public class PublicController extends CertifyApiController {
 	/**
 	 * 	批量导入回款模版
 	 *
-	 * @return
 	 */
 	@RequestMapping(value = "/downloadPovertyTemplate", method = RequestMethod.GET)
 	public void downloadTemplate(HttpServletResponse response) {
-		Result res = new Result();
-		StringBuffer url= new StringBuffer(uploadPath);
-		url=url.append("/tmp").append("/poverty_template.xls");
-		try {
+		StringBuilder url= new StringBuilder(uploadPath);
+        url.append("/tmp").append("/poverty_template.xls");
+        try {
 			response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
 			FileUtils.setAttachmentResponseHeader(response, url.toString(),"poverty导入模版.xls");
 			FileUtils.writeBytes(url.toString(), response.getOutputStream());
@@ -875,7 +866,6 @@ public class PublicController extends CertifyApiController {
 
 	/**
 	 * 查询贫困信息
-	 * @return
 	 */
 	@RequestMapping("/selectFlag")
 	public Result selectFlag(@RequestParam(value = "file", required = false) MultipartFile file) {
@@ -906,15 +896,13 @@ public class PublicController extends CertifyApiController {
 	 * 查询贫困信息
 	 * @param id 贫困信息编号
 	 * @param type 0=所有 ,1=只看有效数据
-	 * @return
 	 */
 	@RequestMapping("/selectPovertyFlagById")
 	public Result selectPovertyFlagById(String id,Integer type) {
 		Result res =new Result();
 		Map<String,Object> map = povertyService.selectFlag(null, id);
 		if (type==null)type=0;
-		List<OutPovertyFlag> resList=new ArrayList<>();
-		if (type==1){
+        if (type==1){
 			map.put("list",map.get("trueList"));
 		}else {
 			map.put("list",map.get("falseList"));
@@ -927,7 +915,6 @@ public class PublicController extends CertifyApiController {
 	 * 查询贫困信息
 	 * @param id 贫困信息编号
 	 * @param type 0=所有 ,1=只看有效数据
-	 * @return
 	 */
 	@RequestMapping("/selectPovertyFlagById/export")
 	public Result selectPovertyFlagByIdExport(String id,Integer type) {
@@ -956,7 +943,6 @@ public class PublicController extends CertifyApiController {
 
 	/**
 	 * 处理催款节点详情
-	 * @return
 	 */
 	@RequestMapping(value = "/pushDunNodeContent",method = RequestMethod.GET)
 	@ResponseBody
@@ -970,7 +956,6 @@ public class PublicController extends CertifyApiController {
 
 	/**
 	 * 处理项目完成时间
-	 * @return
 	 */
 	@RequestMapping(value = "/pushProjectCompleteDate",method = RequestMethod.GET)
 	@ResponseBody