Kaynağa Gözat

代码重置

anderx 4 ay önce
ebeveyn
işleme
7a0ecfa12c

+ 4 - 1
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

@@ -48,7 +48,10 @@
     </resultMap>
 
     <sql id="PublicReleaseAllSql">
-        id, aid, release_start, release_end, remarks, annex_url, status, create_time, pname, duration, valid_date, supplement, audit_info, plan, expected_effect, next_plan, type, order_no, update_time, update_status, assist, assist_aid, assist_aid_name, main_id, main_name, reject_name, assistant_aid, assistant_name, public_again, audit_time, new_user, sign_sum, user_names, object_type, public_type, district_name, clock_in, tech_start_process, address_name, assist_process, alone, process_status
+        id, aid, release_start, release_end, remarks, annex_url, status, create_time, pname, duration, valid_date, supplement,
+        audit_info, plan, expected_effect, next_plan, type, order_no, update_time, update_status, assist, assist_aid, assist_aid_name,
+        main_id, main_name, reject_name, assistant_aid, assistant_name, public_again, audit_time, new_user, sign_sum, user_names, object_type,
+        public_type, district_name, clock_in, tech_start_process, address_name, assist_process, alone, process_status
     </sql>
 
     <!--查询单个-->

+ 1 - 4
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -912,7 +912,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 
 
 	/**
-	 * @param in.type 查看类型 0我的公出 1公出审核 2管理员 3协单(技术财税总监看全部) 4 公出企业负责人审核 5 技术公出审核 6=协单审核
+	 * in.type 查看类型 0我的公出 1公出审核 2管理员 3协单(技术财税总监看全部) 4 公出企业负责人审核 5 技术公出审核 6=协单审核
 	 * @return
 	 */
 	@Override
@@ -1720,7 +1720,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	/**
 	 *
 	 * @param use 原始公出信息
-	 * @param status 状态
 	 * @param date 时间
 	 * @param a
 	 */
@@ -1737,7 +1736,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	/**
 	 * 处理技术协单
 	 * @param use
-	 * @param status
 	 * @param date
 	 */
 	private void updatePushassist(PublicRelease use, PublicRelease updatePR, Date date, Admin a) {
@@ -1865,7 +1863,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	 * 协单审核判定是否跳过的逻辑
 	 * 如果未设置跳过审核,如果已审核跳过
 	 *
-	 * @param s 协单人编号
 	 * @param np 新协单公出信息
 	 * @param use 原公出信息
 	 */