Browse Source

人事开发

Signed-off-by: anderx <312518615@qq.com>
anderx 5 years ago
parent
commit
1b4e2474e8

+ 0 - 1
src/main/java/com/goafanti/common/mapper/PermissionMapper.xml

@@ -307,7 +307,6 @@
 					b.id = c.rid left join permission d on
 					c.pid = d.id
 				where d.type = 0 and a.uid = #{aid,jdbcType=VARCHAR}
-				order by d.show_order
 			</otherwise>
 		</choose>
   </select>

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

@@ -504,7 +504,7 @@
         welfare_annex_name = #{m.welfareAnnexName,jdbcType=VARCHAR},
       </if>
        <if test="m.welfareRemarks != null">
-        welfare_remarks = #{welfareRemarks,jdbcType=VARCHAR},
+        welfare_remarks = #{m.welfareRemarks,jdbcType=VARCHAR},
       </if>
     	</if>
       <if test="type==0">

+ 3 - 3
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -1210,7 +1210,7 @@ select
 	date_format(a.task_end_time,'%Y-%m-%d') as endDate,date_format(a.accept_time,'%Y-%m-%d') as acceptDate,h.name as depName,e.contact_mobile as contactMobile ,
 	date_format(a.review_time,'%Y-%m-%d') as reviewDate,date_format(a.publicity_time,'%Y-%m-%d') as publicityDate,a.outsource_price outsourcePrice,
 	date_format(a.licence_time,'%Y-%m-%d') as licenceDate,date_format(a.task_distribution_time,'%Y-%m-%d') as taskDate,e.legal_person as legalPerson,
-	e.legal_person_tel as legalPersonTel, a.split_status splitStatus, a.split_super splitSuper, a.split_id splitId
+	e.legal_person_tel as legalPersonTel, a.split_status splitStatus, a.split_super splitSuper, a.split_id splitId,a.declaration_batch declarationBatch
 	from t_order_task a left join business_project b on a.commodity_id=b.id left join business_category c on b.cid=c.id
     left join admin d on a.task_receiver=d.id left join t_order_new e on a.order_no=e.order_no
     left join department h on e.order_dep=h.id left join user f on e.buyer_id=f.id
@@ -1231,7 +1231,7 @@ select
   	from t_order_task a left join business_project b on a.commodity_id=b.id left join business_category c on b.cid=c.id
     left join admin d on a.task_receiver=d.id left join t_order_new e on a.order_no=e.order_no left join department dep on e.order_dep=dep.id  
     left join user f on e.buyer_id=f.id left join (select task_id,sum(hours) as hours from t_task_hours group by task_id) g on a.id=g.task_id
-    left join t_order_mid tm on a.order_no=tm.order_no where e.delete_sign !=1 and a.super_id is null and a.split_status !=1
+    left join t_order_mid tm on a.order_no=tm.order_no where e.delete_sign =0 and a.super_id is null and a.split_status in(0,2)
   	<if test="shiroType == 1 and aid !=null">
   	  	and tm.finance_id= #{aid,jdbcType=VARCHAR}
   	</if>
@@ -1271,7 +1271,7 @@ select
    <select id="selectTaskHoursListCount" resultType="java.lang.Integer">
   	select  count(*) from t_order_task a left join business_project b on a.commodity_id=b.id left join business_category c on b.cid=c.id 
   	left join admin d on a.task_receiver=d.id left join t_order_new e on a.order_no=e.order_no left join user f on e.buyer_id=f.id
-    left join t_order_mid tm on a.order_no=tm.order_no where e.delete_sign !=1 and a.super_id is null and a.split_status !=1
+    left join t_order_mid tm on a.order_no=tm.order_no where e.delete_sign =0 and a.super_id is null and a.split_status in(0,2)
   <if test="shiroType == 1 and aid !=null">
   	  	and tm.finance_id= #{aid,jdbcType=VARCHAR}
   	</if>

+ 1 - 1
src/main/java/com/goafanti/order/controller/OrderProjectApiController.java

@@ -81,7 +81,7 @@ public class OrderProjectApiController extends CertifyApiController {
 		return res;
 	}
 	/**
-	 * 任务修改
+	 * 任务修改(咨询师)
 	 */
 	@RequestMapping(value="/updateOrderTask" ,method = RequestMethod.POST)
 	public Result updateOrderTask(TOrderTaskDetailBo t){