Merge branch 'master' into pingyin_master

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenPyHistoryScoreServiceImpl.java

@@ -188,7 +188,7 @@ public class ScreenPyHistoryScoreServiceImpl implements ScreenPyHistoryScoreServ
             }
             if (!CollectionUtils.isEmpty(result.getData())) {
                 GridLivelyResultDTO gridLively = result.getData().get(NumConstant.ZERO);
-                String score = (gridLively.getGridSumNum() <= 0) ? "0" : numberFormat.format(((float) gridLively.getGridLivelyNum() / (float) gridLively.getGridSumNum()) * 100 + (gridLively.getGridOrdinaryNum() / gridLively.getGridSumNum()) * 80);
+                String score = (gridLively.getGridSumNum() <= 0) ? "0" : numberFormat.format(((float) gridLively.getGridLivelyNum() / (float) gridLively.getGridSumNum()) * 100 + ((float)gridLively.getGridOrdinaryNum() / (float)gridLively.getGridSumNum()) * 80);
                 resultDTO.setScore(score);
             }
         } else if ("event".equals(formDTO.getType())) {
@@ -202,7 +202,7 @@ public class ScreenPyHistoryScoreServiceImpl implements ScreenPyHistoryScoreServ
             HistoryScoreSjffResultDTO dto2 = screenPyHistoryScoreDao.sumProjectScore(formDTO);
             //查询街道下有效网格员数
             HistoryScoreSjffResultDTO dto3 = screenPyHistoryScoreDao.sumGridNum(formDTO);
-            String score = numberFormat.format(((float) dto1.getEventScore() / (float) dto3.getGridStaffNum()) + (dto2.getProjectScore() / dto3.getGridStaffNum()));
+            String score = numberFormat.format(((float) dto1.getEventScore() / (float) dto3.getGridStaffNum()) + ((float)dto2.getProjectScore() / (float)dto3.getGridStaffNum()));
             resultDTO.setScore(score);
         }
         return resultDTO;

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ShowApiServiceImpl.java

@@ -129,11 +129,13 @@ public class ShowApiServiceImpl implements ShowApiService {
         try {
             dayDetailResultDTO = ShowApiUtil.queryHolidayV2020(currentDate);
             if (dayDetailResultDTO == null){
-                logger.warn("initWorkDay howApiUtil.queryHolidayV2020 return null");
+                logger.error(String.format("workDayInitTask 获取(%s)工作日接口异常", currentDate));
+                // logger.warn("initWorkDay howApiUtil.queryHolidayV2020 return null");
                 return;
             }
         } catch (Exception e) {
-            logger.error("queryHolidayV2020 exception", e);
+            // logger.error("queryHolidayV2020 exception", e);
+            logger.error(String.format("workDayInitTask 获取(%s)工作日接口异常:%s", currentDate, e.getMessage()));
             return;
         }
         List<CalenderEntity> list = calenderDao.selectByDay(currentDate);

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/WorkDayInitTask.java

@@ -24,11 +24,16 @@ public class WorkDayInitTask implements ITask {
 	@Autowired
 	private WorkDayInitService workDayInitService;
 
+	/**
+	 * 定时任务，调用互联网api，插入calender 表数据
+	 * @param params   参数，多参数使用JSON数据
+	 */
 	@Override
 	public void run(String params) {
 		log.info("WorkDayInitTask定时任务正在执行，参数为：{}", params);
 		if (StringUtils.isBlank(params)){
 			//没有参数默认 初始化明天的
+			//params: yyyyMMdd明天的日期
 			params = DateUtils.format(DateUtils.addDateDays(new Date(), NumConstant.ONE),DateUtils.DATE_PATTERN_YYYYMMDD);
 		}
 		Result result = workDayInitService.workDayInit(params);
@@ -38,4 +43,8 @@ public class WorkDayInitTask implements ITask {
 			log.error("{}定时任务执行失败:{},param:{}" ,getClass().getSimpleName(), result.getMsg(), params);
 		}
 	}
+
+	public static void main(String[] args) {
+		System.out.println(DateUtils.format(DateUtils.addDateDays(new Date(), NumConstant.ONE),DateUtils.DATE_PATTERN_YYYYMMDD));
+	}
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseExportExcelDTO.java

@@ -85,6 +85,7 @@ public class EnterpriseExportExcelDTO {
     @ExcelIgnore
     private String scale;
 
+    @ExcelIgnore
     private Integer scaleTotal;
     /**
      * 规模名称

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -130,9 +130,9 @@
 
                     <if test="subCondition.queryType!= null and subCondition.queryType == 'resi_category' ">
                         <if test="null!=subCondition.columnValue[0] and ''!=subCondition.columnValue[0]">
-                            <foreach collection="subCondition.columnValue" item="colValue" open="" separator="" close="">
+                            <foreach collection="subCondition.columnValue" item="colValue" open=" and (" separator="or" close=")">
                                 <if test="colValue != null and colValue != ''">
-                                    and ${subCondition.tableName}.${colValue} ='1'
+                                     ${subCondition.tableName}.${colValue} ='1'
                                 </if>
                             </foreach>
                         </if>