Merge remote-tracking branch 'origin/dev' into pre

src/main/java/com/xjrsoft/module/banding/service/impl/BandingTaskClassServiceImpl.java

@@ -157,7 +157,7 @@ public class BandingTaskClassServiceImpl extends MPJBaseServiceImpl<BandingTaskC
         BandingTask bandingTask = bandingTaskMapper.selectById(dto.getBandingTaskId());
         dto.setGradeId(bandingTask.getGradeId());
         dto.setEnrollType(bandingTask.getEnrollType());
-        if(bandingTask.getStatus() != null && bandingTask.getStatus() == 1){
+        if(bandingTask != null && bandingTask.getStatus() != null && bandingTask.getStatus() == 1){
             return this.baseMapper.getClassStudentSure(dto);
         }
         return this.baseMapper.getClassStudent(dto);
@@ -166,7 +166,7 @@ public class BandingTaskClassServiceImpl extends MPJBaseServiceImpl<BandingTaskC
     @Override
     public List<BandingTaskClassSureListVo> getClassSure(BandingTaskClassStudentPageDto dto) {
         BandingTask task = bandingTaskMapper.selectById(dto.getBandingTaskId());
-        if(task.getStatus() != null && task.getStatus() == 1){
+        if(task != null && task.getStatus() != null && task.getStatus() == 1){
             return this.baseMapper.getClassSure(dto);
         }
         return this.baseMapper.getClassNotSure(dto);

src/main/java/com/xjrsoft/module/banding/service/impl/BandingTaskClassStudentServiceImpl.java

@@ -346,7 +346,7 @@ public class BandingTaskClassStudentServiceImpl extends MPJBaseServiceImpl<Bandi
         dto.setBandingTaskId(taskClass.getBandingTaskId());
 
         BandingTask task = taskMapper.selectById(taskClass.getBandingTaskId());
-        if(task.getStatus() != null && task.getStatus() == 1){
+        if(task != null && task.getStatus() != null && task.getStatus() == 1){
             return this.baseMapper.satisfyStudentSure(dto);
         }
 
@@ -360,7 +360,7 @@ public class BandingTaskClassStudentServiceImpl extends MPJBaseServiceImpl<Bandi
         dto.setBandingTaskId(taskClass.getBandingTaskId());
 
         BandingTask task = taskMapper.selectById(taskClass.getBandingTaskId());
-        if(task.getStatus() != null && task.getStatus() == 1){
+        if(task != null && task.getStatus() != null && task.getStatus() == 1){
             return this.baseMapper.satisfyStudentSure(dto);
         }
 

src/main/java/com/xjrsoft/module/databoard/controller/DataboardController.java

@@ -394,19 +394,23 @@ public class DataboardController {
         List<Integer> city_in = new ArrayList<>();
         city_in.add(1);city_in.add(0);
         for (Integer i : city_in) {
+            String item = "";
+            if(i == 1){
+                item = "市外";
+            }else{
+                item = "室内";
+            }
+            Double amount = 0D;
             for (Map<String, Object> objectMap : list) {
                 Object cityInObj = objectMap.get("city_in");
-                String item = "";
                 if (cityInObj != null && Integer.parseInt(cityInObj.toString()) == i) {
-                    item = "市外";
-                } else if (cityInObj != null && Integer.parseInt(cityInObj.toString()) == i) {
-                    item = "室内";
+                    amount = Double.parseDouble(objectMap.get("total_amount").toString());
                 }
-                ItemCountAmountVo amountVo = new ItemCountAmountVo();
-                amountVo.setItem(item);
-                amountVo.setAmount(Double.parseDouble(objectMap.get("total_amount").toString()));
-                amountList.add(amountVo);
             }
+            ItemCountAmountVo amountVo = new ItemCountAmountVo();
+            amountVo.setItem(item);
+            amountVo.setAmount(amount);
+            amountList.add(amountVo);
         }
 
         result.setAmountList(amountList);