修改人员信息

This commit is contained in:
YY
2025-07-24 08:25:38 +08:00
parent 40e8ae9d0b
commit 779d922515
22 changed files with 157 additions and 66 deletions

View File

@ -31,7 +31,6 @@
cat.copy_template_id,
cat.category_limitation,
cat.category_id,
cc.category_name,
cat.status,
cat.del_flag,
cat.create_by,
@ -40,7 +39,7 @@
cat.update_time,
cat.last_update_time
from cosco_annualreview_template cat
left join cosco_category cc on cat.category_id= cc.id
</sql>
<select id="selectMyPage"

View File

@ -93,11 +93,8 @@
resultType="com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.CategoryContainListVo">
select cclc.category_library_id categoryLibraryId,
cclc.category_id categoryId,
cclc.lock_type lockType,
cc.parent_id parentId,
cc.category_name categoryName
cclc.lock_type lockType
from cosco_category_library_contain cclc
join cosco_category cc on cclc.category_id = cc.id
where cclc.category_library_id = #{categoryLibraryId}
</select>

View File

@ -216,13 +216,14 @@
<result column="create_time" property="createTime"/>
<result column="create_by" property="createBy"/>
<result column="apply_dept_id" property="applyDeptId"/>
<result column="categoryIds" property="categoryIds"/>
</resultMap>
<select id="selectLibraryPage" parameterType="map"
resultMap="CoscoCategoryLibraryVoMap">
SELECT
ccl.id,
ccl.name,
GROUP_CONCAT(DISTINCT cc.category_name SEPARATOR ', ') AS categoryNames,
GROUP_CONCAT(DISTINCT cclc.category_id SEPARATOR ', ') AS categoryIds,
ccl.create_by,
ccl.apply_dept_id,
ccl.term_of_validity AS termOfValidity,
@ -246,8 +247,7 @@
cosco_category_library ccl
LEFT JOIN
cosco_category_library_contain cclc ON ccl.id = cclc.category_library_id
LEFT JOIN
cosco_category cc ON cc.id = cclc.category_id and cc.type=1
LEFT JOIN
cosco_category_library_supplier_apply cclsa ON cclsa.category_library_id = ccl.id AND cclsa.approve_status = 1
LEFT JOIN
@ -286,7 +286,7 @@
ccl.id,
ccl.name,
ccl.area AS area,
GROUP_CONCAT(DISTINCT cc.category_name SEPARATOR ', ') AS categoryNames,
GROUP_CONCAT(DISTINCT cclc.category_id SEPARATOR ', ') AS categoryIds,
ccl.term_of_validity AS termOfValidity,
ccl.approve_status AS approveStatus,
ccl.last_update_time as approveTime,
@ -298,8 +298,7 @@
left join cosco_category_library ccl on ccls.category_library_id = ccl.id
LEFT JOIN
cosco_category_library_contain cclc ON ccl.id = cclc.category_library_id
LEFT JOIN
cosco_category cc ON cc.id = cclc.category_id and cc.type=1
where cclsa.approve_status = 1 and ccls.supplier_id = #{vo.supplierId}
<if test="vo.name!=null and vo.name!=''">

View File

@ -159,13 +159,12 @@
cet.update_by,
cet.update_time,
cete.template_name,
cec.category_name,
cet.approve_status,
cet.work_flow_id
cet.last_update_time
from cosco_evaluate_task cet
left join cosco_evaluate_template cete on cete.id = cet.template_id
left join cosco_category cec on cec.id = cet.category_id
where cet.work_flow_id = #{workFlowId}
</select>
<select id="selectCoscoEvaluateTaskById" parameterType="String"
@ -189,13 +188,12 @@
cet.update_by,
cet.update_time,
cete.template_name,
cec.category_name,
cet.approve_status,
cet.work_flow_id,
cet.last_update_time
from cosco_evaluate_task cet
left join cosco_evaluate_template cete on cete.id = cet.template_id
left join cosco_category cec on cec.id = cet.category_id
where cet.id = #{id}
</select>
@ -346,10 +344,10 @@
select cet.id,
cet.evaluate_theme as evaluateTheme,
'单位' as tenantName,
cec.category_name as categoryName,
cet.start_time as startTime,
cet.end_time as endTime,
cet.status,
cet.category_id as categoryId,
cet.dept_id as deptId,
cet.approve_status as approveStatus,
case
@ -362,9 +360,7 @@
when cet.status = 1 then '评价中'
when cet.status = 2 then '已结束' end as statusName
from cosco_evaluate_task cet
left join cosco_evaluate_task_supplier_user cetsu on cet.id=cetsu.evaluate_task_id
left join cosco_category cec on cet.category_id=cec.id
</sql>
<select id="selectTaskPage" parameterType="map"

View File

@ -22,6 +22,9 @@
<result property="supplierName" column="supplier_name"/>
<result property="deptId" column="dept_id"/>
<result property="categoryName" column="category_name"/>
<result property="categoryId" column="category_id"/>
</resultMap>
<sql id="selectCoscoEvaluateTaskSupplierVo">
@ -41,7 +44,9 @@
from cosco_evaluate_task_supplier
</sql>
<select id="exportList" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTaskSupplier" resultMap="CoscoEvaluateTaskSupplierResult">
<select id="exportList"
parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTaskSupplier"
resultMap="CoscoEvaluateTaskSupplierResult">
select cets.id,
cets.evaluate_task_id,
cets.level_name,
@ -55,13 +60,12 @@
cets.create_time,
cets.update_by,
cets.update_time,
case when cc.category_name is null then '未指定' else cc.category_name end as category_name,
cet.category_id ,
cets.last_update_time,
csb.name as supplier_name
from cosco_evaluate_task_supplier cets
left join cosco_supplier_base csb on csb.id = cets.supplier_id
left join cosco_evaluate_task cet on cet.id = cets.evaluate_task_id
left join cosco_category cc on cc.id = cet.category_id
<where>
and cets.del_flag = 'normal'
<if test="evaluateTaskId != null and evaluateTaskId != ''">
@ -94,18 +98,16 @@
cets.review_score,
cets.review_result,
cets.del_flag,
cet.dept_id,
cet.category_id,
cets.create_by,
cets.create_time,
cets.update_by,
cets.update_time,
case when cc.category_name is null then '未指定' else cc.category_name end as category_name,
cets.last_update_time,
csb.name as supplier_name
from cosco_evaluate_task_supplier cets
left join cosco_supplier_base csb on csb.id = cets.supplier_id
left join cosco_evaluate_task cet on cet.id = cets.evaluate_task_id
left join cosco_category cc on cc.id = cet.category_id
<where>
and cets.del_flag = 'normal'
<if test="vo.evaluateTaskId != null and vo.evaluateTaskId != ''">
@ -286,8 +288,7 @@
cet.start_time startTime,
cet.end_time endTime,
cetsu.user_id as userId,
case when cc.category_name is null then '未指定'
else cc.category_name end as categoryName,
cet.category_id as categoryId,
cet.STATUS ,
cet.dept_id as deptId,
cetsu.review_status reviewStatus,
@ -308,7 +309,7 @@
LEFT JOIN cosco_evaluate_task cet ON cetsu.evaluate_task_id = cet.id
LEFT JOIN cosco_evaluate_task_supplier cets ON cets.evaluate_task_id = cet.id and cetsu.supplier_id=
cets.supplier_id and cets.del_flag='normal'
left join cosco_category cc on cc.id = cet.category_id
LEFT JOIN cosco_supplier_base csb ON cets.supplier_id = csb.id and csb.del_flag='normal'
<where>
and cetsu.del_flag = 'normal'
@ -344,11 +345,9 @@
when csb.supplier_type = 'ovs' then '境内'
else '境内' end as area ,
cets.id,
(select GROUP_CONCAT( DISTINCT cc.category_name SEPARATOR ', ' )
(select GROUP_CONCAT( DISTINCT casc.category_id SEPARATOR ', ' )
from cosco_access_supplier_category casc
join cosco_category cc
ON cc.id = casc.category_id
where casc.del_flag = 'normal' and casc.supplier_id=csb.id) as categoryName,
where casc.del_flag = 'normal' and casc.supplier_id=csb.id) as categoryIds,
'准入单位' as accessUnit,
'准入部门' as accessDept,
cets.review_result evaluateResult,
@ -381,11 +380,9 @@
when csb.supplier_type = 'ovs' then '境内'
else '境内' end as area ,
csb.id,
(select GROUP_CONCAT( DISTINCT cc.category_name SEPARATOR ', ' )
(select GROUP_CONCAT( DISTINCT casc.category_id SEPARATOR ', ' )
from cosco_access_supplier_category casc
join cosco_category cc
ON cc.id = casc.category_id
where casc.del_flag = 'normal' and casc.supplier_id=csb.id) as categoryName,
where casc.del_flag = 'normal' and casc.supplier_id=csb.id) as categoryIds,
'准入单位' as accessUnit,
'准入部门' as accessDept,
cets.review_result evaluateResult,

View File

@ -52,7 +52,7 @@
<select id="selectMyPage" parameterType="map"
resultType="com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.CoscoEvaluateTemplateVo">
select cet.id,cet.template_name as templateName ,cc.category_name as categoryName,
select cet.id,cet.template_name as templateName ,cet.category_id as categoryId,
"单位" as tenantName,
"部门" as deptName,
cet.create_time as createTime,
@ -65,7 +65,7 @@
when 2 then '停用'
else '未知'
end as statusName
from cosco_evaluate_template cet left join cosco_category cc on cet.category_id = cc.id
from cosco_evaluate_template cet
<where>
and cet.del_flag = 'normal'
<if test="vo.templateName != null and vo.templateName != ''">
@ -129,10 +129,9 @@
cet.indicator_type_more,
cet.indicator_st_more,
cet.indicator_nd_more,
cc.category_name,
cet.last_update_time
from cosco_evaluate_template cet
left join cosco_category cc on cet.category_id=cc.id
left join cosco_evaluate_template cet2 on cet.copy_template_id=cet2.id
where cet.id = #{id}
</select>