Merge branch 'V0.1.0' of http://10.87.21.221:8000/jzyd_yyds/soc into V0.1.0

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/panel/vo/PanelListVo.java

@@ -46,4 +46,10 @@ public class PanelListVo {
 
     @ApiModelProperty(value = "面板功能名称")
     private String beCheckedOrgName;
+
+    @ApiModelProperty(value = "机构id")
+    private Long orgId;
+
+    @ApiModelProperty(value = "机构名称",notes = "地区+行社+机构名称")
+    private String orgName;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/service/impl/QuestionServiceImpl.java

@@ -445,6 +445,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
             List<PanelListVo> vos = list.stream().map(item -> {
                 PanelListVo vo = new PanelListVo();
                 vo.setId(item.getId());
+                vo.setOrgName( orgService.concatOrgName(item.getOrgId(),SecurityConstants.INNER));
                 vo.setEndTime(item.getReformDeadline());
                 vo.setTaskName(item.getQuestionDesc());
                 vo.setStartTime(item.getSubmitTime());

soc-modules/soc-modules-core/src/main/resources/mapper/drill/CoreDrillTaskMapper.xml

@@ -265,8 +265,9 @@
     </update>
 
     <select id="selectCurUserTaskList" resultType="com.xunmei.common.core.domain.panel.vo.PanelListVo">
-        select distinct t.id as id, title as taskName,t.start_date startTime,t.end_date as endTime,t.status
+        select distinct t.id as id, title as taskName,t.start_date startTime,t.end_date as endTime,t.status,concat_ws('-',o.affiliated_area,o.affiliated_bank,o.short_name) as orgName
         from core_drill_task t <!--inner join core_drill_task_to_role tr on t.id=tr.drill_task_id-->
+        inner join sys_org o on o.id=t.org_id
         where t.org_id =#{request.orgId} <!--and tr.role_id in
         <foreach collection="request.roleIdList" item="roleId" open="(" separator="," close=")">
             #{roleId}
@@ -313,7 +314,7 @@
     </sql>
 
     <select id="selectWaitEvaluateTaskList" resultType="com.xunmei.common.core.domain.panel.vo.PanelListVo">
-        select distinct t.id as id, title as taskName,t.start_date startTime,t.end_date as endTime,t.status
+        select distinct t.id as id, title as taskName,t.start_date startTime,t.end_date as endTime,t.status,concat_ws('-',o.affiliated_area,o.affiliated_bank,o.short_name) as orgName
         from core_drill_task t inner join sys_org o on t.org_id=o.id
         where t.status =2
         and t.org_path like concat(#{request.orgPath},'%')
@@ -337,8 +338,8 @@
     </update>
 
     <select id="selectWaitRecTaskList" resultType="com.xunmei.common.core.domain.panel.vo.PanelListVo">
-        select distinct t.id as id, title as taskName,t.start_date startTime,t.end_date as endTime,t.status,t.rec_status
-        from core_drill_task t
+        select distinct t.id as id, title as taskName,t.start_date startTime,t.end_date as endTime,t.status,t.rec_status,concat_ws('-',o.affiliated_area,o.affiliated_bank,o.short_name) as orgName
+        from core_drill_task t  inner join sys_org o on o.id=t.org_id
         where t.org_path like concat(#{request.orgPath},'%')
         <include refid="timeRangeSql"/>
         <if test="request.orgType==3">
@@ -355,8 +356,8 @@
 
 <!--    省联社查询地区评优推优待办-->
     <select id="selectSpecialWaitRecTaskList" resultType="com.xunmei.common.core.domain.panel.vo.PanelListVo">
-        select distinct t.id as id, title as taskName,t.start_date startTime,t.end_date as endTime,t.status,t.rec_status
-        from core_drill_task t
+        select distinct t.id as id, title as taskName,t.start_date startTime,t.end_date as endTime,t.status,t.rec_status,concat_ws('-',o.affiliated_area,o.affiliated_bank,o.short_name) as orgName
+        from core_drill_task t  inner join sys_org o on o.id=t.org_id
         where t.org_path like concat(#{request.orgPath},'%')
         <include refid="timeRangeSql"/>
 <!--        <if test="request.orgType==3">-->

soc-modules/soc-modules-core/src/main/resources/mapper/edu/CoreEduTrainingTaskMapper.xml

@@ -206,16 +206,16 @@
         </if>
     </sql>
     <select id="selectCurUserTaskList" resultType="com.xunmei.common.core.domain.panel.vo.PanelListVo">
-        select distinct t.id as id, title as taskName, t.start_date startTime, t.end_date as endTime, t.status
-        from core_edu_training_task t
+        select distinct t.id as id, title as taskName, t.start_date startTime, t.end_date as endTime, t.status,concat_ws('-',o.affiliated_area,o.affiliated_bank,o.short_name) as orgName
+        from core_edu_training_task t  inner join sys_org o on o.id=t.org_id
         where t.org_id = #{request.orgId}
         and t.status in (0, 1, 4)
         <include refid="timeRangeSql"/>
     </select>
 
     <select id="selectUserAllEduTrainingSignList" resultType="com.xunmei.common.core.domain.panel.vo.PanelListVo">
-        select distinct t.id as id, title as taskName, t.start_date startTime, t.end_date as endTime, t.status
-        from core_edu_training_task t
+        select distinct t.id as id, title as taskName, t.start_date startTime, t.end_date as endTime, t.status,concat_ws('-',o.affiliated_area,o.affiliated_bank,o.short_name) as orgName
+        from core_edu_training_task t   inner join sys_org o on o.id=t.org_id
         inner join core_edu_training_task_to_user u ON t.id=u.edu_training_task_id
         where t.status in (0, 1, 4) and u.type=1 and u.sign=0 and u.user_id=#{request.userId}
         <include refid="timeRangeSql"/>

soc-modules/soc-modules-core/src/main/resources/mapper/evaluate/CoreEvaluateTaskMapper.xml

@@ -235,9 +235,11 @@
             a.evaluate_name AS taskName,
             a.start_time AS startTime,
             a.end_time AS endTime,
-            a.`status`
+            a.`status`,
+        concat_ws('-',o.affiliated_area,o.affiliated_bank,o.short_name) as orgName
         FROM
             core_evaluate_task a
+        inner join sys_org o on o.id=a.org_id
                 LEFT JOIN core_evaluate_role b ON b.evaluate_id = a.plan_id
                 LEFT JOIN sys_role c ON c.id = b.role_id
                 LEFT JOIN core_evaluate_task_user e ON e.task_id = a.id

soc-modules/soc-modules-core/src/main/resources/mapper/letter/CoreIntroduceLetterMapper.xml

@@ -391,8 +391,10 @@
         c.start_time AS startTime,
         c.end_time AS endTime,
         c.effective_days,
-        c.approve_status AS STATUS
+        c.approve_status AS STATUS,
+        concat_ws('-',o.affiliated_area,o.affiliated_bank,o.short_name) as orgName
         from core_introduce_letter_out_in_request c
+        inner join sys_org o on o.id=c.org_id
         where c.deleted = 0 AND c.approve_status =0
         <if test="request.orgId !=null  and request.orgId !=''">
             and c.org_id = #{request.orgId}

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

@@ -249,11 +249,11 @@
     </select>
     <select id="selectCurUserTaskList" resultType="com.xunmei.common.core.domain.panel.vo.PanelListVo">
         select distinct t.id as id,
-        name as taskName,
+        t.name as taskName,
         t.plan_start_time as startTime,
         t.plan_end_time as endTime,
-        t.status
-        from core_resumption t
+        t.status,concat_ws('-',o.affiliated_area,o.affiliated_bank,o.short_name) as orgName
+        from core_resumption t  inner join sys_org o on o.id=t.org_id
         where t.org_id = #{request.orgId}
         and t.plan_id in (select pr.plan_id
         from core_resumption_plan_to_role pr

soc-modules/soc-modules-core/src/main/resources/mapper/retrieval/CoreMonitoringRetrievalTaskMapper.xml

@@ -675,8 +675,8 @@
     <select id="selectCurUserTaskList" resultType="com.xunmei.common.core.domain.panel.vo.PanelListVo">
         select distinct t.id as id, task_name as taskName,t.plan_start_time as startTime,t.plan_end_time as
         endTime,t.status,
-        1 AS isExist
-        from core_monitoring_retrieval_task t
+        1 AS isExist,concat_ws('-',o.affiliated_area,o.affiliated_bank,o.short_name) as orgName
+        from core_monitoring_retrieval_task t inner join sys_org o on o.id=t.org_id
         where t.org_id =#{request.orgId} and t.role_id in
         <foreach collection="request.roleIdList" item="roleId" open="(" separator="," close=")">
             #{roleId}

soc-modules/soc-modules-core/src/main/resources/mapper/safetycheck/CoreSafetyTaskMapper.xml

@@ -838,8 +838,8 @@
         order by tt.uncompletedCount desc,tt.planStartTime
     </select>
     <select id="selectTaskList" resultType="com.xunmei.core.safetyCheck.domain.CoreSafetyTask">
-        select t.*
-        from core_safety_task t
+        select t.*,concat_ws('-',o.affiliated_area,o.affiliated_bank,o.short_name) as orgName
+        from core_safety_task t inner join sys_org o on o.id=t.org_id
         where t.deleted=0
         <if test="params.beCheckedOrgId!=null">
             and t.org_id=#{params.beCheckedOrgId}
@@ -888,8 +888,8 @@
     </select>
 
     <select id="selectCurUserTaskList" resultType="com.xunmei.common.core.domain.panel.vo.PanelListVo">
-        select distinct t.id as id, title as taskName,t.plan_start_time as startTime,t.plan_end_time as endTime,t.status,t.org_name as beCheckedOrgName
-        from core_safety_task t
+        select distinct t.id as id, title as taskName,t.plan_start_time as startTime,t.plan_end_time as endTime,t.status,t.org_name as beCheckedOrgName,concat_ws('-',o.affiliated_area,o.affiliated_bank,o.short_name) as orgName
+        from core_safety_task t   inner join sys_org o on o.id=t.org_id
         where (t.grant_user_id = #{request.userId} or ( t.check_org_id =#{request.orgId}
         and t.plan_id in (select id from core_safecheck_plan p
         inner join core_safecheck_plan_to_role pr on p.id=pr.plan_id and pr.role_id in