修改部分逻辑

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/controller/ResumptionController.java

@@ -15,9 +15,7 @@ import com.xunmei.core.resumption.dto.TaskDetailsDto;
 import com.xunmei.core.resumption.service.ResumptionBusiness;
 import com.xunmei.core.resumption.service.ResumptionService;
 import com.xunmei.core.resumption.vo.*;
-import com.xunmei.core.resumption.vo.resumptionRegister.ResumptionNfcVo;
-import com.xunmei.core.resumption.vo.resumptionRegister.ResumptionRegisterAreaVo;
-import com.xunmei.core.resumption.vo.resumptionRegister.ResumptionRegisterVo;
+import com.xunmei.core.resumption.vo.resumptionRegister.*;
 import com.xunmei.system.api.RemoteConfigService;
 import com.xunmei.system.api.domain.SysConfig;
 import io.swagger.annotations.ApiOperation;
@@ -92,18 +90,18 @@ public class ResumptionController {
                 resumptionApp) {
 
             if (r.getPlanCycle() == 2) {
-                if(r.getStatus() == 3) {
+                if (r.getStatus() == 3) {
                     all.getDay().get("2").add(r);
                     //已过期视为未完成
                 } else if (r.getStatus() == 4) {
                     all.getDay().get("3").add(r);
-                }else {
-                    if (DateUtil.beginOfDay(request.getDateTime()) .compareTo(DateUtil.beginOfDay( r.getPlanStartTime())) == 0) {
+                } else {
+                    if (DateUtil.beginOfDay(request.getDateTime()).compareTo(DateUtil.beginOfDay(r.getPlanStartTime())) == 0) {
                         //未开始和进行中视为待完成
 //                        if (r.getStatus() == 1 || r.getStatus() == 2) {
-                            all.getDay().get("1").add(r);
+                        all.getDay().get("1").add(r);
 //                        }
-                    }else{
+                    } else {
                         all.getDay().get("3").add(r);
                     }
                 }
@@ -149,24 +147,39 @@ public class ResumptionController {
         List<ResumptionRegisterAreaVo> tasktotal = resumptionBusiness.toTaskDetails(request);
 
         //nfc总区域数量统计
-        Integer nfcScanTotal = 0;
-        Long nfcScaned = 0L;
-        for (ResumptionRegisterAreaVo m :
-                tasktotal) {
-            List<ResumptionNfcVo> nfc = m.getNfclist();
-            if (CollectionUtils.isNotEmpty(nfc)) {
-                nfcScanTotal += nfc.size();
-                nfcScaned += nfc.stream().filter(n -> ObjectUtil.equal(n.getStatus(), 1)).count();
+        Integer noSan = 0;
+        Integer yesSan = 0;
+        Integer areaScanN = 0;
+        Integer areaScanY = 0;
+        for (ResumptionRegisterAreaVo area :  tasktotal) {
+            List<ResumptionNfcVo> nfclist = area.getNfclist();
+            for (ResumptionNfcVo nfcVo : nfclist) {
+                Integer status = nfcVo.getStatus();
+                if(status == 0){
+                    noSan++;
+                }else{
+                    yesSan++;
+                }
+
+            }
+            List<ResumptionRegisterItemVo> checklist = area.getChecklist();
+            for (ResumptionRegisterItemVo resumptionRegisterItemVo : checklist) {
+                ResumptionPointVo pointVo = resumptionRegisterItemVo.getCheckitemlist().get(0);
+                if(pointVo.getSubmitTime() != null){
+                    areaScanY++;
+                }else{
+                    areaScanN++;
+                }
             }
+
         }
-        detailvo.setNfcScanN(nfcScanTotal);
-        detailvo.setNfcScanY(Integer.parseInt(nfcScaned.toString()));
+        detailvo.setNfcScanN(noSan);
+        detailvo.setNfcScanY(yesSan);
 
         //区域数量统计
-        Integer areaScanN = 0;
-        areaScanN = tasktotal.size();
+
         detailvo.setAreaScanN(areaScanN);
-        detailvo.setAreaScanY(0);
+        detailvo.setAreaScanY(areaScanY);
 
         ResumptionTaskListVo taskObj = resumptionBusiness.getTaskObjByTaskid(request);
 //        SysConfig systemParame = remoteConfigService.findFirstByCode(SystemParameterConstant.NFC_SCANNING, SecurityConstants.INNER).getData();

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysOrgExtendController.java

@@ -31,7 +31,7 @@ public class SysOrgExtendController extends BaseController {
      * 查询机构扩展列表
      */
     @ApiOperation(value = "查询SysOrgExtend列表")
-    @RequiresPermissions("system:extend:list")
+    //@RequiresPermissions("system:extend:list")
     @GetMapping("/list")
     public TableDataInfo<SysOrgExtend> list(SysOrgExtend sysOrgExtend) {
 
@@ -43,7 +43,7 @@ public class SysOrgExtendController extends BaseController {
      * 获取机构扩展详细信息
      */
     @ApiOperation(value = "获取SysOrgExtend详细信息")
-    @RequiresPermissions("system:extend:query")
+    //@RequiresPermissions("system:extend:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(sysOrgExtendService.selectSysOrgExtendById(id));
@@ -52,7 +52,7 @@ public class SysOrgExtendController extends BaseController {
      * 获取机构扩展详细信息
      */
     @ApiOperation(value = "获取SysOrgExtend详细信息")
-    @RequiresPermissions("system:extend:query")
+    //@RequiresPermissions("system:extend:query")
     @GetMapping(value = "/org/{id}")
     public AjaxResult getInfoByOrgId(@PathVariable("id") Long id) {
         return success(sysOrgExtendService.selectSysOrgExtendByOrgId(id));
@@ -61,7 +61,7 @@ public class SysOrgExtendController extends BaseController {
      * 新增机构扩展
      */
     @ApiOperation(value = "新增SysOrgExtend")
-    @RequiresPermissions("system:extend:add")
+    //@RequiresPermissions("system:extend:add")
     @Log(title = "机构扩展", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody SysOrgExtend sysOrgExtend) {
@@ -72,7 +72,7 @@ public class SysOrgExtendController extends BaseController {
      * 新增/编辑机构扩展
      */
     @ApiOperation(value = "新增/编辑SysOrgExtend")
-    @RequiresPermissions("system:extend:add")
+    //@RequiresPermissions("system:extend:add")
     @Log(title = "新增/编辑机构扩展", businessType = BusinessType.INSERT)
     @PostMapping("/addOrUpdate")
     public AjaxResult addOrUpdate(@RequestBody SysOrgExtendDto sysOrgExtend) {
@@ -84,7 +84,7 @@ public class SysOrgExtendController extends BaseController {
      * 修改机构扩展
      */
     @ApiOperation(value = "修改SysOrgExtend")
-    @RequiresPermissions("system:extend:edit")
+    //@RequiresPermissions("system:extend:edit")
     @Log(title = "机构扩展", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody SysOrgExtend sysOrgExtend) {
@@ -95,7 +95,7 @@ public class SysOrgExtendController extends BaseController {
      * 删除机构扩展
      */
     @ApiOperation(value = "删除SysOrgExtend")
-    @RequiresPermissions("system:extend:remove")
+    //@RequiresPermissions("system:extend:remove")
     @Log(title = "机构扩展", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysPhysicalDefenseConstructionController.java

@@ -37,7 +37,7 @@ public class SysPhysicalDefenseConstructionController extends BaseController {
      * 查询机构物防建设列表
      */
     @ApiOperation(value = "查询SysPhysicalDefenseConstruction列表")
-    @RequiresPermissions("system:construction:list")
+    //@RequiresPermissions("system:construction:list")
     @GetMapping("/list")
     public TableDataInfo<SysPhysicalDefenseConstruction> list(SysPhysicalDefenseConstruction sysPhysicalDefenseConstruction) {
 
@@ -49,7 +49,7 @@ public class SysPhysicalDefenseConstructionController extends BaseController {
      * 获取机构物防建设详细信息
      */
     @ApiOperation(value = "获取SysPhysicalDefenseConstruction详细信息")
-    @RequiresPermissions("system:construction:query")
+    //@RequiresPermissions("system:construction:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(sysPhysicalDefenseConstructionService.selectSysPhysicalDefenseConstructionById(id));
@@ -59,7 +59,7 @@ public class SysPhysicalDefenseConstructionController extends BaseController {
      * 新增机构物防建设
      */
     @ApiOperation(value = "新增SysPhysicalDefenseConstruction")
-    @RequiresPermissions("system:construction:add")
+    //@RequiresPermissions("system:construction:add")
     @Log(title = "机构物防建设", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody SysPhysicalDefenseConstruction sysPhysicalDefenseConstruction) {
@@ -70,7 +70,7 @@ public class SysPhysicalDefenseConstructionController extends BaseController {
      * 修改机构物防建设
      */
     @ApiOperation(value = "修改SysPhysicalDefenseConstruction")
-    @RequiresPermissions("system:construction:edit")
+    //@RequiresPermissions("system:construction:edit")
     @Log(title = "机构物防建设", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody SysPhysicalDefenseConstruction sysPhysicalDefenseConstruction) {
@@ -81,7 +81,7 @@ public class SysPhysicalDefenseConstructionController extends BaseController {
      * 删除机构物防建设
      */
     @ApiOperation(value = "删除SysPhysicalDefenseConstruction")
-    @RequiresPermissions("system:construction:remove")
+    //@RequiresPermissions("system:construction:remove")
     @Log(title = "机构物防建设", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {