Merge remote-tracking branch 'origin/master'

# Conflicts:
#	cement-business/src/main/java/cn/wise/sc/cement/business/controller/PlanStandardPurchaseController.java
#	cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/PlanStandardPurchaseServiceImpl.java

cement-business/src/main/java/cn/wise/sc/cement/business/controller/NonStandardApprovalController.java

@@ -100,6 +100,9 @@ public class NonStandardApprovalController {
 	@PostMapping("/updateAppraisal")
 	public BaseResponse update(Double appraisalValue) {
 		try {
+			if (appraisalValue == null || appraisalValue==0){
+				return BaseResponse.okMsg("考核公值不能为空或0!");
+			}
 			return iNonStandardApprovalService.updateAppraisal(appraisalValue);
 		} catch (Exception e) {
 			log.debug("审批通过/驳回{}", e);

cement-business/src/main/java/cn/wise/sc/cement/business/controller/PlanStandardPurchaseController.java

@@ -29,34 +29,35 @@ import javax.servlet.http.HttpServletResponse;
 @RequestMapping("/business/plan-standard-purchase")
 public class PlanStandardPurchaseController {
 
-    private static final Logger log = LoggerFactory.getLogger("PlanStandardPurchaseController");
-
-    @Autowired
-    private IPlanStandardPurchaseService standardPurchaseService;
-
-    @ApiOperation(value = "标样采购计划分页列表")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "name", value = "产品名称", paramType = "query", dataType = "String")
-    })
-    @GetMapping("/getPage")
-    public BaseResponse getPage(PageQuery pageQuery, String name) {
-        try {
-            return standardPurchaseService.getPage(pageQuery, name);
-        } catch (Exception e) {
-            log.debug("标样采购计划分页列表{}", e);
-        }
-        return BaseResponse.errorMsg("失败!");
-    }
-
-    @ApiOperation("标样采购计划列表导出")
-    @PostMapping("/export")
-    public void export(String name, String fileName, HttpServletResponse response) {
-        try {
-            standardPurchaseService.export(name, fileName, response);
-        } catch (Exception e) {
-            log.debug("标样采购计划列表导出{}", e);
-        }
-    }
+	private static final Logger log = LoggerFactory.getLogger("PlanStandardPurchaseController");
+
+	@Autowired
+	private IPlanStandardPurchaseService standardPurchaseService;
+
+	@ApiOperation(value = "标样采购计划分页列表")
+	@ApiImplicitParams(value = {
+			@ApiImplicitParam(name = "name", value = "产品名称", paramType = "query", dataType = "String"),
+			@ApiImplicitParam(name = "code", value = "标物编号", paramType = "query", dataType = "String")
+	})
+	@GetMapping("/getPage")
+	public BaseResponse getPage(PageQuery pageQuery, String name,String code) {
+		try {
+			return standardPurchaseService.getPage(pageQuery, name,code);
+		} catch (Exception e) {
+			log.debug("标样采购计划分页列表{}", e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+	@ApiOperation("标样采购计划列表导出")
+	@PostMapping("/export")
+	public void export(String name, String fileName, HttpServletResponse response) {
+		try {
+			standardPurchaseService.export(name, fileName, response);
+		} catch (Exception e) {
+			log.debug("标样采购计划列表导出{}", e);
+		}
+	}
 
 
     @ApiOperation("标样采购计划列表导出(word)")
@@ -88,38 +89,38 @@ public class PlanStandardPurchaseController {
         return BaseResponse.errorMsg("失败!");
     }
 
-    @ApiOperation(value = "标样采购计划详情")
-    @GetMapping("/{id}")
-    public BaseResponse getDetail(@PathVariable Integer id) {
-        try {
-            return standardPurchaseService.getDetail(id);
-        } catch (Exception e) {
-            log.debug("标样采购计划详情{}", e);
-        }
-        return BaseResponse.errorMsg("失败!");
-    }
-
-    @ApiOperation(value = "采购完成")
-    @PostMapping("/finish")
-    public BaseResponse finish(Integer id) {
-        try {
-            return standardPurchaseService.finish(id);
-        } catch (Exception e) {
-            log.debug("采购完成{}", e);
-        }
-        return BaseResponse.errorMsg("失败!");
-    }
-
-    @ApiOperation(value = "删除")
-    @PostMapping("/delete/{id}")
-    public BaseResponse delete(@PathVariable Integer id) {
-        try {
-            return standardPurchaseService.delete(id);
-        } catch (Exception e) {
-            log.debug("删除{}", e);
-        }
-        return BaseResponse.errorMsg("失败!");
-    }
+	@ApiOperation(value = "标样采购计划详情")
+	@GetMapping("/{id}")
+	public BaseResponse getDetail(@PathVariable Integer id) {
+		try {
+			return standardPurchaseService.getDetail(id);
+		} catch (Exception e) {
+			log.debug("标样采购计划详情{}", e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+	@ApiOperation(value = "采购完成")
+	@PostMapping("/finish")
+	public BaseResponse finish(Integer id) {
+		try {
+			return standardPurchaseService.finish(id);
+		} catch (Exception e) {
+			log.debug("采购完成{}", e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+	@ApiOperation(value = "删除")
+	@PostMapping("/delete/{id}")
+	public BaseResponse delete(@PathVariable Integer id) {
+		try {
+			return standardPurchaseService.delete(id);
+		} catch (Exception e) {
+			log.debug("删除{}", e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
 
 }
 

cement-business/src/main/java/cn/wise/sc/cement/business/entity/NonStandardValue.java

@@ -35,12 +35,12 @@ public class NonStandardValue implements Serializable {
 	@ApiModelProperty("起止日期")
 	private String statistical;
 
-	@ApiModelProperty("上报工时")
-	private Double approvalHours;
-
 	@ApiModelProperty("上报工日")
 	private Double reportedHours;
 
+	@ApiModelProperty("审批工时")
+	private Double approvalHours;
+
 	@ApiModelProperty("状态 0：未提交 1：待审批 2：已通过 3：未通过")
 	private Integer status;
 
@@ -59,9 +59,6 @@ public class NonStandardValue implements Serializable {
 	@ApiModelProperty("开始时间")
 	private LocalDate startTime;
 
-	@ApiModelProperty("结束时间")
-	private LocalDate endTime;
-
 	@ApiModelProperty("用户id")
 	private Integer userId;
 

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/NonStandardValueMapper.xml

@@ -38,7 +38,7 @@
         LEFT JOIN sys_user su ON su.id = na.user_id
         LEFT JOIN sys_group sg ON sg.id = su.group_id
         <include refid="where"/>
-        order by na.id asc
+        order by na.start_time desc
     </select>
 <!--    <select id="getByUserId" resultType="cn.wise.sc.cement.business.model.vo.NonStandardValueVo">-->
 <!--        select na.*,su.name as name,su.username as account,na.start_time as startTime,su.group_id as groups,sg.name as-->

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/PlanStandardPurchaseMapper.xml

@@ -10,6 +10,9 @@
             <if test="params.name != null and params.name != ''">
                 and t.name like concat('%', #{params.name}, '%')
             </if>
+            <if test="params.code != null and params.code != ''">
+                and t.code like concat('%', #{params.code}, '%')
+            </if>
         </where>
     </sql>
 

cement-business/src/main/java/cn/wise/sc/cement/business/service/IPlanStandardPurchaseService.java

@@ -20,7 +20,7 @@ import javax.servlet.http.HttpServletResponse;
  */
 public interface IPlanStandardPurchaseService extends IService<PlanStandardPurchase> {
 
-	BaseResponse<IPage<PlanStandardPurchaseVo>> getPage(PageQuery pageQuery, String name);
+	BaseResponse<IPage<PlanStandardPurchaseVo>> getPage(PageQuery pageQuery, String name,String code);
 
 	void export(String name, String fileName, HttpServletResponse response);
 

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/NonStandardValueServiceImpl.java

@@ -84,6 +84,7 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
 			//初始化最终结果===>不初始化默认为NULL，不能进行+——*/
 			finalNonStandardValue.setId(0);
 			finalNonStandardValue.setApprovalHours(0D);
+			finalNonStandardValue.setReportedHours(0D);
 			finalNonStandardValue.setFinalValue(0D);
 			//todo 为当前userID创建一天展示的产值对象 new 产值对象 ===>传出
 			for (NonStandardValueVo nonStandardValue : data) {
@@ -113,6 +114,11 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
 					//用新得到的最总工时覆盖掉原来的总工时===>累加
 					finalNonStandardValue.setApprovalHours(newApprovalHours);
 
+					Double RHhouers = nonStandardValue.getReportedHours().doubleValue();
+					Double newReportedHours = nonStandardValue.getReportedHours() + finalNonStandardValue.getReportedHours();
+					//用新得到的最总工时覆盖掉原来的总工时===>累加
+					finalNonStandardValue.setReportedHours(newReportedHours);
+
 					Double finalValue = nonStandardValue.getFinalValue().doubleValue();
 					Double newFinalValue = nonStandardValue.getFinalValue() + finalNonStandardValue.getFinalValue();
 					finalNonStandardValue.setFinalValue(newFinalValue);