Merge remote-tracking branch 'origin/master'

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/CheckTemplateServiceImpl.java

@@ -56,23 +56,38 @@ public class CheckTemplateServiceImpl extends ServiceImpl<CheckTemplateDao, Chec
     private CheckItemContentService checkItemContentService;
     @Autowired
     private SysUserDao sysUserDao;
+    public static final List<String> MONTH_ENG = new ArrayList<String>() {{
+        add("january");
+        add("february");
+        add("march");
+        add("april");
+        add("may");
+        add("june");
+        add("july");
+        add("august");
+        add("september");
+        add("october");
+        add("november");
+        add("december");
+    }};
 
     /**
      * 通用Map转自定义业务实体类
+     *
      * @param map
      * @return
      */
-    public CheckTemplateVo mapToCheckTemplateVo(Map<String,Object> map){
-        GeneralApiParameter generalApiParameter = BeanUtil.mapToBeanIgnoreCase(map, GeneralApiParameter.class,true);
-        CheckTemplateVo checkTemplateVo = BeanUtil.mapToBeanIgnoreCase(generalApiParameter.getMasterPar(), CheckTemplateVo.class,true);
+    public CheckTemplateVo mapToCheckTemplateVo(Map<String, Object> map) {
+        GeneralApiParameter generalApiParameter = BeanUtil.mapToBeanIgnoreCase(map, GeneralApiParameter.class, true);
+        CheckTemplateVo checkTemplateVo = BeanUtil.mapToBeanIgnoreCase(generalApiParameter.getMasterPar(), CheckTemplateVo.class, true);
         List<SlaveDMLVo> slaveDMLVos = generalApiParameter.getSlaveDMLVos();
-        if(slaveDMLVos != null && slaveDMLVos.size()>0){
-            for(SlaveDMLVo slaveDMLVo:slaveDMLVos){
+        if (slaveDMLVos != null && slaveDMLVos.size() > 0) {
+            for (SlaveDMLVo slaveDMLVo : slaveDMLVos) {
                 //字段明细表处理
-                if("asp_check_template_items".equalsIgnoreCase(slaveDMLVo.getTableName())){
+                if ("asp_check_template_items".equalsIgnoreCase(slaveDMLVo.getTableName())) {
                     //新增数据
                     slaveDMLVo.getSlaveInsert().forEach(item -> {
-                        CheckTemplateItemsVo checkTemplateItemsVo = BeanUtil.mapToBeanIgnoreCase(item.getInsertcolumns(),CheckTemplateItemsVo.class,true);
+                        CheckTemplateItemsVo checkTemplateItemsVo = BeanUtil.mapToBeanIgnoreCase(item.getInsertcolumns(), CheckTemplateItemsVo.class, true);
                         checkTemplateVo.getCheckTemplateItems().add(checkTemplateItemsVo);
                     });
                     //更新数据
@@ -261,9 +276,9 @@ public class CheckTemplateServiceImpl extends ServiceImpl<CheckTemplateDao, Chec
             else if("year".equals(frequencys[0])){
                 String monthday = frequencys[1];
                 String day = frequencys[2];
-                if(monthday.equals((DateUtil.thisMonth()+1)) && day.equals(DateUtil.thisDayOfMonth())){
+                if (monthday.equals(MONTH_ENG.get(DateUtil.thisMonth())) && day.equals(String.valueOf(DateUtil.thisDayOfMonth()))) {
                     isCreate = true;
-                }else{
+                } else {
                     isCreate = false;
                 }
             }else{