77

science-admin/src/main/resources/mapper/ComProjectAssignDAO.xml

@@ -6,7 +6,7 @@
         t.id as id, t.expert_id as expertId, t.proj_id as projId, t.assign_year as assignYear, t.total_score as gradeScore, t.remark as remark, t.created as created, t.updated as updated
     </sql>
     <select id="getListByPage" resultType="com.yiboshi.science.param.dto.ComProjectAssignDTO">
-        SELECT  a.*, c.person_name,c.cert_id,c.sex,c.birthday,c.mobile,c.email,c.education,c.title,g.unit_name,d.name education_name,
+        SELECT  a.*, c.person_name,c.cert_id,c.sex,c.birthday,c.mobile,c.email,c.education,c.title,g.unit_name,d.name education_name,c.work_unit,
                 e.name title_name,f.proj_name,f.app_no,f.proj_no,f.proj_class,h.total_funding, i.unit_name as app_unit_name, k.group_name
         FROM com_project_assign a
         LEFT JOIN com_expert b ON a.expert_id = b.id

science-admin/src/main/resources/mapper/ComProjectAuditDAO.xml

@@ -19,11 +19,11 @@
     </select>
     <select id="getProjectAuditListByPage"  resultType="com.yiboshi.science.param.dto.ComProjectAuditDTO">
         SELECT
-        a.*,c.id proj_id,c.proj_name,c.proj_no,c.version_no,c.app_no,c.proj_class,c.start_date,c.end_date,c.proj_state,c.total_score,c.average_score,c.knowledge_id,
+        a.*,c.id proj_id,c.proj_name,c.proj_no,c.version_no,c.app_no,c.proj_class,c.start_date,c.end_date,c.proj_state,c.knowledge_id,
+        c.total_score,c.average_score,c.technology_score,c.technology_average_score,c.economy_score,c.economy_average_score,c.calculate_score,
         d.unit_name app_unit_name,e.person_name app_person_name,p.name as knowledgeName,p1.name as knowledgeParentName,
         (case when g.unit_name = d.unit_name then '直属' else REPLACE(g.unit_name,'卫生健康局','') end) as upUnitName
-        FROM
-        com_project_audit a
+        FROM com_project_audit a
         left join com_project c on a.audit_object_id=c.id
         left join com_unit d on c.app_unit_id=d.id
         left join com_unit g on substring(d.tree_code, 1, 10) = g.tree_code