Merge remote-tracking branch 'origin/master'

boman-web-core/src/main/java/com/boman/web/core/controller/TaskController.java

@@ -20,9 +20,9 @@ public class TaskController {
     @Resource
     private TaskService taskService;
     /**
-     * 每月1号往考勤记录表根据用户插入当月的数据 每月一号00:00分
+     * 每月1号往考勤记录表根据用户插入当月的数据 每月一号00:00:05秒
      */
-    @Scheduled(cron = "0 0 23 * * ?")
+    @Scheduled(cron = "5 0 0 1 * ?")
     private void configureTasks() {
         System.out.println(DateUtils.getNowDate() +"开始执行定时任务");
         taskService.configureTasks();

boman-web-core/src/main/java/com/boman/web/core/service/TaskService.java

@@ -44,8 +44,8 @@ public class TaskService {
      */
     public void configureTasks() {
         //获取当月每一天
-        Date nowDate = DateUtils.getNowDate();
-        List<String> monthEveryDays = DateUtils.getMonthEveryDays(nowDate.toString());
+        String date = DateUtils.getDate();
+        List<String> monthEveryDays = DateUtils.getMonthEveryDays(date);
         //获取所有用户
         List<SysUser> sysUsers = remoteUserService.selectUserListAll();
         if (sysUsers != null && sysUsers.size() > 0){

boman-web-core/src/main/resources/mapper/VaccineInfoMapper.xml

@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         vi.region, vi.user_name, vi.gender, vi.id_card, vi.phone_num, vi.key_industries, vi.is_vaccination, vi.vaccine_name, vi.jici,
         vi.vaccination_time, vi.vaccination_place, vi.contraindication, vi.suspend, vi.death, vi.lost_in_missing,
         vi.should_be, vi.other, vi.progress, vi.remark, vi.status, vi.create_by, vi.create_time, vi.update_by, vi.update_time,
-               vi.is_del,code,vi.birthday,vi.work_unit,vi.crowd_classification,vi.manufacturer,vi.now_in,vi.url,
+               vi.is_del,vi.code,vi.birthday,vi.work_unit,vi.crowd_classification,vi.manufacturer,vi.now_in,vi.url,
                viu.id as id_user,viu.id_card as id_card_user,viu.vaccine_name as vaccine_name_user,viu.jici as jici_user,viu.vaccination_time as vaccination_time_user,
                viu.vaccination_place as vaccination_place_user,viu.progress as progress_user,viu.status as status_user
                from vaccine_info vi left join vaccine_info_user viu
@@ -67,7 +67,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectVaccineInfoList" parameterType="VaccineInfoOperation" resultMap="VaccineInfoResult">
-        <include refid="selectVaccineInfoVo"/>
+
+        select vi.id, vi.village_towns, vi.village, vi.villager_group, vi.house_type, vi.domicile, vi.province, vi.city,
+        vi.region, vi.user_name, vi.gender, vi.id_card, vi.phone_num, vi.key_industries, vi.is_vaccination, vi.vaccine_name, vi.jici,
+        vi.vaccination_time, vi.vaccination_place, vi.contraindication, vi.suspend, vi.death, vi.lost_in_missing,
+        vi.should_be, vi.other, vi.progress, vi.remark, vi.status, vi.create_by, vi.create_time, vi.update_by, vi.update_time,
+        vi.is_del,vi.code,vi.birthday,vi.work_unit,vi.crowd_classification,vi.manufacturer,vi.now_in,vi.url from vaccine_info vi
         <where>
             vi.is_del = 'N'
             <if test="villageTowns != null  and villageTowns != ''"> and vi.village_towns = #{villageTowns}</if>