任务结算-工时暂存

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

@@ -139,7 +139,12 @@ public class XmTaskSbillController {
 		Map<String,Object> m = new HashMap<>();
 		Tips tips=new Tips("成功删除一条数据");
 		if(!"0".equals(xmTaskSbill.getStatus())){
-			tips.setFailureMsg("当前状态不允许删除");
+			tips.setFailureMsg("只有待提交的结算单才能删除");
+			m.put("tips", tips);
+			return m;
+		}
+		if(!("0".equals(xmTaskSbill.getBizFlowState()) || "4".equals(xmTaskSbill.getBizFlowState()))){
+			tips.setFailureMsg("已发审数据不允许删除");
 			m.put("tips", tips);
 			return m;
 		}
@@ -167,11 +172,17 @@ public class XmTaskSbillController {
 		Map<String,Object> m = new HashMap<>();
 		Tips tips=new Tips("成功更新一条数据");
 		if(!"0".equals(xmTaskSbill.getStatus())){
-			tips.setFailureMsg("当前状态不允许修改");
+			tips.setFailureMsg("只能修改待提交的结算单");
+			m.put("tips", tips);
+			return m;
+		}
+		if(!("0".equals(xmTaskSbill.getBizFlowState()) || "4".equals(xmTaskSbill.getBizFlowState()))){
+			tips.setFailureMsg("已发审数据不允许修改");
 			m.put("tips", tips);
 			return m;
 		}
 		try{
+			xmTaskSbill.setLtime(new Date());
 			xmTaskSbillService.updateByPk(xmTaskSbill);
 			m.put("data",xmTaskSbill);
 		}catch (BizException e) { 

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

@@ -141,7 +141,7 @@ public class XmTaskWorkloadController {
 	}
 	 */
 	
-	/**
+
 	@ApiOperation( value = "根据主键修改一条工时登记表信息",notes=" ")
 	@ApiResponses({
 		@ApiResponse(code = 200,response=XmTaskWorkload.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
@@ -170,7 +170,6 @@ public class XmTaskWorkloadController {
 		m.put("tips", tips);
 		return m;
 	}
-	*/
 	
 
 	
@@ -196,4 +195,24 @@ public class XmTaskWorkloadController {
 		return m;
 	} 
 	*/
+
+	/**
+	 * 用于结算单
+	 * */
+	@ApiOperation( value = "查询工时登记表信息列表",notes=" ")
+	@ApiResponses({
+			@ApiResponse(code = 200,response=XmTaskWorkload.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
+	})
+	@RequestMapping(value="/listByProject",method=RequestMethod.GET)
+	public Map<String,Object> listXmTaskWorkloadByProject( @RequestParam Map<String,Object> xmTaskWorkload){
+		Map<String,Object> m = new HashMap<>();
+		Tips tips=new Tips("查询成功");
+		PageUtils.startPage(xmTaskWorkload);
+		List<Map<String,Object>>	xmTaskWorkloadList = xmTaskWorkloadService.selectList("selectListMapByProject",xmTaskWorkload);	//列出XmTaskWorkload列表
+		PageUtils.responePage(m, xmTaskWorkloadList);
+		m.put("data",xmTaskWorkloadList);
+
+		m.put("tips", tips);
+		return m;
+	}
 }

xm-core/src/main/java/com/xm/core/entity/XmTaskWorkload.java

@@ -20,7 +20,7 @@ public class XmTaskWorkload  implements java.io.Serializable {
 	private static final long serialVersionUID = 1L;
 	
 	@ApiModelProperty(notes="主键,主键",allowEmptyValue=true,example="",allowableValues="")
-	Integer id;
+	String id;
   	
 	
 	@ApiModelProperty(notes="员工编号",allowEmptyValue=true,example="",allowableValues="")
@@ -69,7 +69,7 @@ public class XmTaskWorkload  implements java.io.Serializable {
 	BigDecimal workload;
 
 	/**主键**/
-	public XmTaskWorkload(Integer id) {
+	public XmTaskWorkload(String id) {
 		this.id = id;
 	}
     
@@ -134,7 +134,7 @@ public class XmTaskWorkload  implements java.io.Serializable {
 	/**
 	 * 主键
 	 **/
-	public void setId(Integer id) {
+	public void setId(String id) {
 		this.id = id;
 	}
 	/**
@@ -231,7 +231,7 @@ public class XmTaskWorkload  implements java.io.Serializable {
 	/**
 	 * 主键
 	 **/
-	public Integer getId() {
+	public String getId() {
 		return this.id;
 	}
 	/**

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

@@ -11,7 +11,9 @@
                         ( #{id})
                     </foreach>
              </if>
-		    <if test="key != null and key !='' ">       </if>
+		    <if test="key != null and key !='' ">
+			 	AND( res.id like #{key} OR res.title like #{key} OR res.project_name like #{key} )
+			</if>
 		</sql>
 
 

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

@@ -14,6 +14,22 @@
         <if test="key != null and key !='' ">       </if>
     </sql>
 
+	<!-- 通过条件查询获取未提交结算的工作量 返回list<map> -->
+	<select id="selectListMapByProject" parameterType="HashMap" resultType="HashMap">
+		select task.project_id,res.* from xm_task_workload res
+		inner join xm_task task
+		on res.task_id = task.id
+		<where>
+			res.wstatus = '1'
+			AND task.project_id = #{projectId}
+			<if test="key != null and key !='' ">
+			AND
+			( task.id like #{key} OR task.name like #{key}
+			</if>
+		</where>
+	</select>
+
+
 
 	<!--结束 自定义sql函数区域-->