Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/AppPlanServiceImpl.java

@@ -159,6 +159,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
             plan.setPlanOfOrgId(d.getOrgId());
             plan.setPlanStatus(d.getStatus());
             plan.setDistributePlanStatus(d.getStatus().toString());
+            plan.setCreateTime(new Date());
             plan.setId(null);
 //            plan.setPlanName(plan.getPlanName()+"下发"+orgService.selectOrgById(d.getOrgId(),SecurityConstants.INNER).getName());
             plan.setPlanName(plan.getPlanName());
@@ -230,6 +231,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
         if (app.getId() == null) {
             plan.setParentId(-1L);
             plan.setDeleted(0);
+            plan.setCreateTime(new Date());
             //新增
             plan.setPlanOfOrgId(app.getPlanCreateOrgId());
             plan.setPlanOfOrgName(app.getPlanCreateOrgName());
@@ -306,7 +308,8 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
 //                throw new RuntimeException("计划名称重复，请确认！");
 //            }
 
-
+            plan.setUpdateTime(new Date());
+            plan.setModifiedBy(SecurityUtils.getUserId());
             baseMapper.updateById(plan);
 
 
@@ -319,6 +322,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
                 ap.setPlanStatus(plan.getPlanStatus());
                 ap.setExecOrgType(plan.getExecOrgType());
                 ap.setPlanExec(plan.getPlanExec());
+                ap.setModifiedBy(SecurityUtils.getUserId());
                 baseMapper.updateById(ap);
 
                 if (app.getRoleList().size() > 0) {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/vo/appPlan/ResumptionPlanPageVo.java

@@ -32,6 +32,7 @@ public class ResumptionPlanPageVo {
      */
 
     private String planName;
+    private String updateName;
 
     /**
      * 计划类型 0：履职计划，1，安全检查，2教育培训

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

@@ -28,6 +28,7 @@
         <!--        <result column="modified_by" property="modifiedBy"/>-->
         <result column="roleNames" property="roleNames"/>
         <result column="orgNames" property="orgNames"/>
+        <result column="update_name" property="updateName"/>
     </resultMap>
 
 
@@ -35,6 +36,7 @@
             resultMap="appPlans">
         SELECT
         a.*,
+        u2.name as update_name,
         d.roleNames,
         b.orgId,
         b.orgNames,
@@ -43,6 +45,7 @@
         g.type as createOrgType
         FROM
         core_resumption_plan a
+        left join sys_user u2 on u2.id=a.modified_by
         LEFT JOIN (
         SELECT
         m.plan_id,
@@ -72,9 +75,9 @@
             <if test="info.planName != '' and info.planName != null">
                 and a.plan_name LIKE CONCAT('%', #{info.planName}, '%' )
             </if>
-<!--            <if test="info.resumptionRole != '' and info.resumptionRole != null">-->
-<!--                and r.role_id =#{info.resumptionRole}-->
-<!--            </if>-->
+            <!--            <if test="info.resumptionRole != '' and info.resumptionRole != null">-->
+            <!--                and r.role_id =#{info.resumptionRole}-->
+            <!--            </if>-->
             <if test="info.planStatus != null">
                 and a.plan_status = #{info.planStatus}
             </if>
@@ -123,6 +126,7 @@
             resultMap="appPlans">
         SELECT
         a.*,
+        u2.name as update_name,
         d.roleNames,
         b.orgId,
         b.orgNames,
@@ -130,6 +134,7 @@
         g.name as plan_create_org_name
         FROM
         core_resumption_plan a
+        left join sys_user u2 on u2.id=a.modified_by
         LEFT JOIN (
         SELECT
         m.plan_id,

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -468,7 +468,7 @@
             AND u.is_lock = #{info.isLock}
         </if>
         <if test="info.phone != null and info.phone != ''">
-            AND u.phone like concat(#{info.phone},'%')
+            AND u.phone like concat('%',concat(#{info.phone},'%'))
         </if>
         <if test="info.username != null and info.username != ''">
             AND u.username like concat('%', #{info.username}, '%')