Merge remote-tracking branch 'origin/master'

xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillController.java

@@ -149,7 +149,8 @@ public class XmTaskSbillController {
 			return m;
 		}
 		try{
-			xmTaskSbillService.deleteByPk(xmTaskSbill);
+			//删除结算单时候，要一起恢复工时单为未加入结算状态
+			xmTaskSbillService.deleteByPkAndReturnWorkload(xmTaskSbill);
 		}catch (BizException e) { 
 			tips=e.getTips();
 			logger.error("",e);

xm-core/src/main/java/com/xm/core/service/XmTaskSbillService.java

@@ -1,9 +1,12 @@
 package com.xm.core.service;
 
+import com.xm.core.entity.XmTaskWorkload;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import java.util.List;
 import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.mdp.core.service.BaseService;
 import static com.mdp.core.utils.BaseUtils.*;
@@ -11,6 +14,8 @@ import com.mdp.core.entity.Tips;
 import com.mdp.core.err.BizException;
 
 import com.xm.core.entity.XmTaskSbill;
+import org.springframework.transaction.annotation.Transactional;
+
 /**
  * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.<br> 
  * 组织 com  顶级模块 xm 大模块 core 小模块 <br>
@@ -20,5 +25,17 @@ import com.xm.core.entity.XmTaskSbill;
 public class XmTaskSbillService extends BaseService {
 	static Logger logger =LoggerFactory.getLogger(XmTaskSbillService.class);
 
+	@Autowired
+	XmTaskWorkloadService xmTaskWorkloadService;
+
+	@Transactional(rollbackFor = Exception.class)
+	public void deleteByPkAndReturnWorkload(XmTaskSbill xmTaskSbill){
+		this.deleteByPk(xmTaskSbill);
+		XmTaskWorkload xmTaskWorkload = new XmTaskWorkload();
+		xmTaskWorkload.setSbillId(xmTaskSbill.getId());
+		xmTaskWorkload.setSstatus("1");//标记为待提交结算
+		xmTaskWorkloadService.update("updateSomeFieldByWhere",xmTaskWorkload);
+	}
+
 }
 

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskWorkloadMapper.xml

@@ -21,16 +21,25 @@
 		on res.task_id = task.id
 		<where>
 			res.wstatus = '1'
+			AND res.sstatus = '1'
 			AND task.project_id = #{projectId}
 			<if test="key != null and key !='' ">
 			AND
-			( task.id like #{key} OR task.name like #{key}
+			( task.id like #{key} OR task.name like #{key} OR res.userid like #{key} OR res.username like #{key} )
 			</if>
 		</where>
 	</select>
 
-
-
+	<!-- 根据条件修改若干条记录 -->
+	<update id="updateSomeFieldByWhere" parameterType="com.xm.core.entity.XmTaskWorkload">
+		update  xm_task_workload res
+		<set>
+			res.sstatus = #{sstatus}
+		</set>
+		<where>
+			res.sbill_id = #{sbillId}
+		</where>
+	</update>
 	<!--结束 自定义sql函数区域-->