调整履职任务

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/RemoteConfigService.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
 
-@FeignClient(contextId = "remoteConfigService", value = ServiceNameConstants.CORE_SERVICE, fallbackFactory = RemoteConfigFallbackFactory.class)
+@FeignClient(contextId = "remoteConfigService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteConfigFallbackFactory.class)
 public interface RemoteConfigService {
     @GetMapping("/config/findFirstByCode")
     R<SysConfig> findFirstByCode(@RequestParam("code") String code, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

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

@@ -41,8 +41,8 @@ public class TaskController {
         DateTime datetime = new DateTime();
         datetime.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
 //        SCHEDULEDTASKSLOG.info("================开始执行每日每小时履职任务生成任务================");
-        taskBusiness.syncHour(datetime,6);
-        taskBusiness.syncDay(datetime,0);
+//        taskBusiness.syncHour(datetime,6);
+        taskBusiness.syncDay(datetime,2);
 //        SCHEDULEDTASKSLOG.info("================每日每小时履职任务生成任务执行结束================");
         return AjaxResult.success();
     }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/domain/AppPlan.java

@@ -25,7 +25,7 @@ import java.util.Date;
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-@TableName("sys_plan")
+@TableName("core_resumption_plan")
 @AllArgsConstructor
 public class AppPlan extends Model<AppPlan> implements Serializable {
     private static final long serialVersionUID = 1L;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/domain/AppPlanToCheckOrg.java

@@ -18,7 +18,7 @@ import java.io.Serializable;
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-@TableName("sys_plan_to_check_org")
+@TableName("core_resumption_plan_to_check_org")
 public class AppPlanToCheckOrg extends Model<AppPlanToCheckOrg> implements Serializable {
     private static final long serialVersionUID = 1L;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/domain/AppPlanToExecOrg.java

@@ -18,7 +18,7 @@ import java.io.Serializable;
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-@TableName("sys_plan_to_exec_org")
+@TableName("core_resumption_plan_to_exec_org")
 public class AppPlanToExecOrg extends Model<AppPlanToExecOrg> implements Serializable {
     private static final long serialVersionUID = 1L;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/domain/AppPlanToItem.java

@@ -18,7 +18,7 @@ import java.io.Serializable;
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-@TableName("sys_plan_to_item")
+@TableName("core_resumption_plan_to_item")
 public class AppPlanToItem extends Model<AppPlanToItem> implements Serializable {
     private static final long serialVersionUID = 1L;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/domain/AppPlanToRole.java

@@ -18,7 +18,7 @@ import java.io.Serializable;
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-@TableName("sys_plan_to_role")
+@TableName("core_resumption_plan_to_role")
 public class AppPlanToRole extends Model<AppPlanToRole> implements Serializable {
     private static final long serialVersionUID = 1L;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/domain/SysResumption.java

@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
 import com.xunmei.common.core.web.domain.BaseEntity;
 
 /**
- * 【请填写功能名称】对象 sys_resumption
+ * 【请填写功能名称】对象 core_resumption
  *
  * @author xunmei
  * @date 2023-08-22
@@ -25,7 +25,7 @@ import com.xunmei.common.core.web.domain.BaseEntity;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@TableName("sys_resumption")
+@TableName("core_resumption")
 @ApiModel(value = "SysResumption对象", description = "【请填写功能名称】")
 public class SysResumption extends BaseEntity {
     private static final long serialVersionUID = 1L;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/task/ResumptionTaskBusiness.java

@@ -201,13 +201,14 @@ public class ResumptionTaskBusiness {
      */
     @Async
     public void syncDay(final DateTime dateTime, int plancycle) {//plancycle==0
-        SysConfig officeAllHourParam = systemParameService.findFirstByCode("officeBuilding_open_allhours",SecurityConstants.INNER).getData();
+        R<SysConfig> officeBuilding_open_allhours = systemParameService.findFirstByCode("officeBuilding_open_allhours", SecurityConstants.INNER);
+        SysConfig officeAllHourParam = officeBuilding_open_allhours.getData();
         //获取履职计划
         List<AppPlan> AppPlanList = appPlanService.list((new QueryWrapper<AppPlan>()).lambda()
-                .eq(AppPlan::getPlanStatus, 0)
-                .eq(AppPlan::getPlanCycle, plancycle)
-                .eq(AppPlan::getPlanType, 0)
-                .notIn(AppPlan::getPlanExec, canteenPlanExec));
+                .eq(AppPlan::getPlanStatus, 1)
+                .eq(AppPlan::getPlanCycle, plancycle));
+//                .eq(AppPlan::getPlanType, 1)
+//                .notIn(AppPlan::getPlanExec, canteenPlanExec));
         for (AppPlan appPlan : AppPlanList) {
             //获取履职计划中对应的检查要点
             List<AppRulePointTaskVo> pointList = appRulePointService.findPointByPlan(appPlan.getId());

soc-modules/soc-modules-core/src/main/resources/mapper/resumption/AppPlanMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xunmei.core.resumption.mapper.AppPlanMapper">
     <sql id="tableName">
-        sys_plan
+        core_resumption_plan
     </sql>
 
     <sql id="baseColumn">
@@ -38,14 +38,14 @@
         b.orgId,
         b.orgNames
         FROM
-        sys_plan a
+        core_resumption_plan a
         LEFT JOIN (
         SELECT
         m.plan_id,
         GROUP_CONCAT( n.`name` ) orgNames,
         GROUP_CONCAT( n.id ) orgId
         FROM
-        sys_plan_to_exec_org m
+        core_resumption_plan_to_exec_org m
         LEFT JOIN sys_org n ON m.org_id = n.id
         GROUP BY
         m.plan_id
@@ -55,7 +55,7 @@
         r.plan_id,
         group_concat( t.`role_name` ) roleNames
         FROM
-        sys_plan_to_role r
+        core_resumption_plan_to_role r
         LEFT JOIN sys_role t ON r.role_id = t.id
         GROUP BY
         r.plan_id
@@ -78,14 +78,14 @@
                 and a.exec_org_type = #{info.orgType}
             </if>
             <if test="info.roleList != null and info.roleList.size > 0">
-                and a.id in (select plan_id from sys_plan_to_role where role_id in
+                and a.id in (select plan_id from core_resumption_plan_to_role where role_id in
                 <foreach collection="info.roleList" item="roleId" index="index" open="(" separator="," close=")">
                     #{roleId}
                 </foreach>
                 )
             </if>
             <if test="info.orgList != null and info.orgList.size > 0">
-                and a.id in (select plan_id from sys_plan_to_exec_org where org_id in
+                and a.id in (select plan_id from core_resumption_plan_to_exec_org where org_id in
                 <foreach collection="info.orgList" item="orgId" index="index" open="(" separator="," close=")">
                     #{orgId}
                 </foreach>
@@ -138,7 +138,7 @@
                h.required,
                d.name  as ruleName,
                a.business_type as businessType
-        FROM (SELECT item_id, point_scan, required FROM sys_plan_to_item WHERE plan_id = #{planId}) h
+        FROM (SELECT item_id, point_scan, required FROM core_resumption_plan_to_item WHERE plan_id = #{planId}) h
                  LEFT JOIN core_resumption_rule_point a ON h.item_id = a.item_id
                  LEFT JOIN core_resumption_rule_item b ON a.item_id = b.id
                  LEFT JOIN sys_area c ON a.area_id = c.id
@@ -148,19 +148,19 @@
 
     <select id="findExecOrgByPlan" parameterType="Long" resultType="Long">
         select org_id
-        from sys_plan_to_exec_org a
+        from core_resumption_plan_to_exec_org a
         INNER JOIN t_org o on a.org_id=o.id and o.deleted=0 and o.is_lock=0 and o.temporarily_closed=0
         where a.plan_id = #{plan_id}
     </select>
     <select id="findRoleByPlan" parameterType="Long" resultType="Long">
         select role_id
-        from sys_plan_to_role a
+        from core_resumption_plan_to_role a
         where a.plan_id = #{plan_id}
     </select>
 
     <select id="selectPlanList" resultType="com.xunmei.core.resumption.vo.appPlan.ObjectDataClass">
         select id as id, plan_name as name
-        from sys_plan
+        from core_resumption_plan
         where plan_status = 0 and exec_type = 0
         <if test="orgType != null">
             and exec_org_type = #{orgType}
@@ -176,7 +176,7 @@
         8.30以后不再需要此类计划
 
         (select id, plan_name as name
-        from sys_plan
+        from core_resumption_plan
         where plan_status = 0 and exec_type = 0
         <if test="orgType != null">
             and exec_org_type = #{orgType}
@@ -189,9 +189,9 @@
         UNION ALL
         (SELECT p.id,
         p.plan_name as name
-        FROM sys_plan_to_exec_org tapo
+        FROM core_resumption_plan_to_exec_org tapo
         INNER JOIN t_org o ON tapo.org_id = o.id
-        INNER JOIN sys_plan p ON tapo.plan_id = p.id
+        INNER JOIN core_resumption_plan p ON tapo.plan_id = p.id
 
         where p.plan_status = 0
 
@@ -206,11 +206,11 @@
 
     <select id="selectPlanByName" resultMap="appPlans">
         select *
-        from sys_plan
+        from core_resumption_plan
         where plan_name like CONCAT('%', #{planName}, '%')
         limit 1
     </select>
     <select id="selectPlanNameById" resultType="java.lang.String">
-        select plan_name from sys_plan where id = #{planId}
+        select plan_name from core_resumption_plan where id = #{planId}
     </select>
 </mapper>

soc-modules/soc-modules-core/src/main/resources/mapper/resumption/AppPlanToCheckOrgMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xunmei.core.resumption.mapper.AppPlanToCheckOrgMapper">
     <sql id="tableName">
-        sys_plan_to_check_org
+        core_resumption_plan_to_check_org
     </sql>
 
     <sql id="baseColumn">

soc-modules/soc-modules-core/src/main/resources/mapper/resumption/AppPlanToExecOrgMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xunmei.core.resumption.mapper.AppPlanToExecOrgMapper">
     <sql id="tableName">
-        sys_plan_to_exec_org
+        core_resumption_plan_to_exec_org
     </sql>
 
     <sql id="baseColumn">

soc-modules/soc-modules-core/src/main/resources/mapper/resumption/AppPlanToItemMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xunmei.core.resumption.mapper.AppPlanToItemMapper">
     <sql id="tableName">
-        sys_plan_to_item
+        core_resumption_plan_to_item
     </sql>
 
     <sql id="baseColumn">
@@ -11,7 +11,7 @@
 
     <select id="selectItemIdsByPlanId" resultType="java.lang.Long">
         select distinct item_id
-        from sys_plan_to_item
+        from core_resumption_plan_to_item
         where plan_id = #{planId}
     </select>
 </mapper>

soc-modules/soc-modules-core/src/main/resources/mapper/resumption/AppPlanToRoleMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xunmei.core.resumption.mapper.AppPlanToRoleMapper">
     <sql id="tableName">
-        sys_plan_to_role
+        core_resumption_plan_to_role
     </sql>
 
     <sql id="baseColumn">

soc-modules/soc-modules-core/src/main/resources/mapper/resumption/AppRulePointMapper.xml

@@ -49,7 +49,7 @@
 <!--    </select>-->
     <select id="findPointByPlan" parameterType="Long" resultType="com.xunmei.core.resumption.vo.AppRulePointTaskVo">
         SELECT a.*, b.point_scan
-        from sys_rule_point a
+        from core_resumption_rule_point a
                  LEFT JOIN t_app_plan_to_item b ON a.id = b.item_id
                  LEFT JOIN t_app_plan c ON b.plan_id = c.id
         WHERE c.id = #{planid}

soc-modules/soc-modules-core/src/main/resources/mapper/resumption/ResumptionMapper.xml

@@ -30,7 +30,7 @@
             STATUS,
             a.type AS type
         FROM
-            sys_resumption a
+            core_resumption a
                 LEFT JOIN t_app_plan b ON a.plan_id = b.id
         WHERE
             a.ymd_year =#{year}
@@ -95,7 +95,7 @@
             a.plan_start_time ASC
     </select>
     <select id="findOneByTaskIdAndDate" resultType="com.xunmei.core.resumption.domain.Resumption">
-        select * from sys_resumption where id=#{taskid} and ymd_year=#{year} and ymd_quarter=#{quarter}
+        select * from core_resumption where id=#{taskid} and ymd_year=#{year} and ymd_quarter=#{quarter}
 
     </select>
     <select id="findOneByTaskId" resultType="java.util.Map">

soc-modules/soc-modules-core/src/main/resources/mapper/resumption/SysResumptionMapper.xml

@@ -35,7 +35,7 @@
 
     <sql id="selectSysResumptionVo">
         select id, create_time, modified_id, modified_name, update_time, exception_count, form_type, org_id, status, type, ymd_date, ymd_day, ymd_month, ymd_quarter, ymd_week, ymd_year, ymd_halfyear, submit_time, ymd_hour, ymd_minute, plan_id, start_time, end_time, plan_start_time, plan_end_time, role_id
-        from sys_resumption
+        from core_resumption
     </sql>
 
     <select id="selectSysResumptionList" parameterType="com.xunmei.core.resumption.domain.SysResumption"
@@ -121,7 +121,7 @@
     </select>
     <select id="findResumptionList" resultType="com.xunmei.core.resumption.vo.WorkChangeResumptionVo">
         select a.id,b.id as planId,b.plan_exec as planExec,a.status,a.org_id as orgId
-        from sys_resumption a left join t_app_plan b on a.plan_id =b.id
+        from core_resumption a left join t_app_plan b on a.plan_id =b.id
         where a.ymd_year = #{year} and a.ymd_quarter=#{quarter} and a.ymd_date=#{date} and `type`=#{type} and b.plan_exec not in (4,5,6) and a.org_id in
         <foreach collection="orgIds" item="item" open="(" separator="," close=")">
             #{item}
@@ -133,7 +133,7 @@
     </select>
 
     <insert id="insertSysResumption" parameterType="com.xunmei.core.resumption.domain.SysResumption">
-        insert into sys_resumption
+        insert into core_resumption
         <trim prefix="(" suffix=")" suffixOverrides=",">
                     <if test="id != null">id,
                     </if>
@@ -245,7 +245,7 @@
     </insert>
 
     <update id="updateSysResumption" parameterType="com.xunmei.core.resumption.domain.SysResumption">
-        update sys_resumption
+        update core_resumption
         <trim prefix="SET" suffixOverrides=",">
                     <if test="createTime != null">create_time =
                         #{createTime},
@@ -328,17 +328,17 @@
 
     <delete id="deleteSysResumptionById" parameterType="String">
         delete
-        from sys_resumption where id = #{id}
+        from core_resumption where id = #{id}
     </delete>
 
     <delete id="deleteSysResumptionByIds" parameterType="String">
-        delete from sys_resumption where id in
+        delete from core_resumption where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
     <delete id="deleteResumption">
-        delete from sys_resumption where ymd_year = #{year} and ymd_quarter=#{quarter} and id in
+        delete from core_resumption where ymd_year = #{year} and ymd_quarter=#{quarter} and id in
         <foreach collection="ids" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysConfigServiceImpl.java

@@ -44,7 +44,7 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
     }
     @Override
     public SysConfig findFirstByCode(String code) {
-        return configMapper.selectOne(new QueryWrapper<SysConfig>().eq("code", code));
+        return configMapper.selectOne(new QueryWrapper<SysConfig>().eq("config_key", code));
     }
     @Override
     public TableDataInfo<SysConfig> selectPage(SysConfig sysConfig) {