Przeglądaj źródła

服务项添加更新删除时,更新缓存中关于item的信息
修改报表导出格式

huangchengzdm 8 lat temu
rodzic
commit
3a5272c83a

+ 18 - 10
VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/CheckItemController.java

@@ -1,20 +1,20 @@
 package com.xintong.visualinspection.controller;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.validation.Valid;
-
+import com.xintong.system.err.BusinessException;
+import com.xintong.visualinspection.bean.CheckItem;
+import com.xintong.visualinspection.bean.CheckRule;
+import com.xintong.visualinspection.service.CheckItemService;
+import com.xintong.visualinspection.service.ItemService;
+import com.xintong.visualinspection.util.CacheUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.xintong.system.err.BusinessException;
-import com.xintong.visualinspection.bean.CheckItem;
-import com.xintong.visualinspection.bean.CheckRule;
-import com.xintong.visualinspection.service.CheckItemService;
+import javax.validation.Valid;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 文件名:CheckItemController
@@ -26,6 +26,8 @@ public class CheckItemController extends BaseController {
 
     @Autowired
     private CheckItemService checkItemService;
+    @Autowired
+    private ItemService itemService;
 
    
     /**
@@ -38,6 +40,8 @@ public class CheckItemController extends BaseController {
     @RequestMapping(value = "/add")
     public String add(@Valid @RequestBody CheckItem checkItem){
     	checkItemService.insert(checkItem);
+        CacheUtil.refreshItemMap(itemService);
+        CacheUtil.refreshItemNameMap(itemService);
     	return super.returnSuccessResult("添加成功");
     }
     
@@ -51,6 +55,8 @@ public class CheckItemController extends BaseController {
     @RequestMapping(value = "/update")
     public String update(@Valid @RequestBody CheckItem checkItem){
     	checkItemService.update(checkItem);
+        CacheUtil.refreshItemMap(itemService);
+        CacheUtil.refreshItemNameMap(itemService);
     	return super.returnSuccessResult("修改成功");
     }
     
@@ -64,6 +70,8 @@ public class CheckItemController extends BaseController {
     @RequestMapping(value = "/delete")
     public String delete(@RequestBody CheckItem checkItem){
     	checkItemService.delete(checkItem.getId());
+        CacheUtil.refreshItemMap(itemService);
+        CacheUtil.refreshItemNameMap(itemService);
     	return super.returnSuccessResult("删除成功");
     }
     

+ 1 - 21
Visuallnspection_fjq/visuallnspection_fjq/src/main/java/com/xintong/visualinspection/visuallnspection_fjq/service/impl/StatisticsService_FImpl.java

@@ -152,28 +152,8 @@ public class StatisticsService_FImpl implements StatisticsService_F {
     @Override
     public void getOperationInfo(FwqStatisticsBean obj, HttpServletRequest req, HttpServletResponse resp) {
         List<FwqStatisticsBean> lists = getOperationInfo(obj);
-        int totalCompanyNum = 0,
-                totalCompanyScore = 0,
-                totalThirdNum = 0,
-                totalThirdScore = 0,
-                totalOnsiteNum = 0,
-                totalOnsiteScore = 0;
-        for (FwqStatisticsBean bean : lists) {
-            totalCompanyNum += bean.getCompany_check_num();
-            totalCompanyScore += bean.getCompany_total_score();
-            totalThirdNum += bean.getThird_check_num();
-            totalThirdScore += bean.getThird_total_score();
-            totalOnsiteNum += bean.getOnsite_check_num();
-            totalOnsiteScore += bean.getOnsite_total_score();
-        }
-        Map<String, Object> map = new HashMap<>(5);
+        Map<String, Object> map = new HashMap<>(1);
         map.put("list", lists);
-        map.put("totalCompanyNum", totalCompanyNum);
-        map.put("totalCompanyScore", totalCompanyScore);
-        map.put("totalThirdNum", totalThirdNum);
-        map.put("totalThirdScore", totalThirdScore);
-        map.put("totalOnsiteNum", totalOnsiteNum);
-        map.put("totalOnsiteScore", totalOnsiteScore);
         exportExcel("运营管理综合检查情况统计表", "fwq_operation_info", map, resp);
     }
 

BIN
Visuallnspection_fjq/visuallnspection_fjq/src/main/resources/fwq_operation_info.xls