sangwenwei 1 rok pred
rodič
commit
85139a44c7

+ 2 - 4
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/project/mapper/xml/JyProjectReportsSubmitMapper.xml

@@ -44,7 +44,6 @@
             a.remarks,
             a.proc_ins_id,
             a.process_definition_id,
-            a.first_submit_time,
             so.name as office,
             so.id,
             art.ID_ as task_id
@@ -52,7 +51,7 @@
             left join sys_user su on a.create_by_id = su.id
             left join sys_office so on su.office_id=so.id
             left join act_ru_task art ON a.proc_ins_id = art.PROC_INST_ID_
-            where a.first_submit_time < #{newDate} and a.status != '5' and a.type_status = '2'
+            where a.create_time < #{newDate} and a.status != '5' and a.type_status = '2'
     </select>
 
     <update id="updateExceedTimeStatus">
@@ -73,7 +72,6 @@
             a.remarks,
             a.proc_ins_id,
             a.process_definition_id,
-            a.first_submit_time,
             so.name as office,
             so.id,
             art.ID_ as task_id
@@ -81,7 +79,7 @@
             left join sys_user su on a.create_by_id = su.id
             left join sys_office so on su.office_id=so.id
             left join act_ru_task art ON a.proc_ins_id = art.PROC_INST_ID_
-            where a.first_submit_time &gt;= #{newDate} and a.status != '5' and a.type_status = '2'
+            where a.create_time &gt;= #{newDate} and a.status != '5' and a.type_status = '2'
     </select>
 
 </mapper>

+ 1 - 1
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/workContractInfo/mapper/xml/JyWorkContractInfoMapper.xml

@@ -197,7 +197,7 @@
 	</update>
 
 	<select id="findType" resultType="string">
-		SELECT dv.label from sys_dict_value dv LEFT JOIN sys_dict_type dt on dt.id=dv.dict_type_id where dv.`value`=#{contractType} and dt.type='jy_contract_type_up'
+		SELECT dv.label from sys_dict_value dv LEFT JOIN sys_dict_type dt on dt.id=dv.dict_type_id where dv.`id`=#{contractType} and dt.type='jy_contract_type'
 	</select>
 
 	<select id="findType2" resultType="string">