能力管理--联调

历史档案--联调
非标产值--联调

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

 package cn.wise.sc.cement.business.controller;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import cn.wise.sc.cement.business.entity.NonStandardValue;
 import cn.wise.sc.cement.business.model.BaseResponse;
 import cn.wise.sc.cement.business.model.PageQuery;
@@ -17,6 +19,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.xml.crypto.Data;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -38,9 +42,9 @@ public class NonStandardValueController {
 
 	@ApiOperation(value = "非标产值分页")
 	@GetMapping("/getPage")
-	public BaseResponse getPage(PageQuery pageQuery,Integer userId,Integer status) {
+	public BaseResponse getPage(PageQuery pageQuery,Integer userId,String name) {
 		try {
-			return inonStandardValueService.getPage(pageQuery,userId,status);
+			return inonStandardValueService.getPage(pageQuery,userId,name);
 		} catch (Exception e) {
 			log.debug("非标产值分页列表{}", e);
 		}
@@ -49,9 +53,11 @@ public class NonStandardValueController {
 
 	@GetMapping("/user_id")
 	@ApiOperation("非标产值统计")
-	public BaseResponse nonValue(PageQuery pageQuery) {
+	public BaseResponse nonValue(PageQuery pageQuery, String start,String end) {
+		Date startParse = DateUtil.parse(start);
+		Date endParse = DateUtil.parse(end);
 		//将list拆分成分页
-		BaseResponse<List<NonStandardValue>> baseResponse = inonStandardValueService.nonValue();
+		BaseResponse<List<NonStandardValue>> baseResponse = inonStandardValueService.nonValue(startParse,endParse);
 			List<NonStandardValue> data = baseResponse.getData();
 			if (data.size() != 0) {
 				Page<NonStandardValue> rts = PageUtil.listConvertToPage(data, pageQuery);
@@ -62,9 +68,11 @@ public class NonStandardValueController {
 
 	@ApiOperation(value = "获取所有已通过的非标产值")
 	@GetMapping("/getList")
-	public BaseResponse getList() {
+	public BaseResponse getList(String start,String end) {
 		try {
-			return inonStandardValueService.getList();
+			Date startParse = DateUtil.parse(start);
+			Date endParse = DateUtil.parse(end);
+			return inonStandardValueService.getList(startParse,endParse);
 		} catch (Exception e) {
 			log.debug("获取所有已通过的非标产值{}", e);
 		}

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

@@ -59,4 +59,10 @@ public class NonStandardValue implements Serializable {
 
 	@ApiModelProperty("用户id")
 	private Integer userId;
+
+	@ApiModelProperty("name")
+	private String name;
+
+	@ApiModelProperty("account")
+	private String account;
 }

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

@@ -23,4 +23,5 @@ public interface NonStandardValueMapper extends BaseMapper<NonStandardValue> {
 
 	List<Map<String, Object>> exportList(@Param("params") Map<String, Object> params);
 
+	List<NonStandardValueVo> getList(@Param("params") Map<String, Object> params);
 }

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

@@ -13,6 +13,9 @@
             <if test="params.userId != null ">
                 and na.user_id = #{params.userId}
             </if>
+            <if test="params.startTime !=null">
+                and na.start_time = #{params.startTime}
+            </if>
         </where>
     </sql>
 
@@ -24,7 +27,13 @@
         order by na.id asc
     </select>
 
-
+    <select id="getList" resultType="cn.wise.sc.cement.business.model.vo.NonStandardValueVo">
+        select na.*,su.name as name,su.username as account,na.start_time as startTime
+        from nonstandard_apply na
+        LEFT JOIN sys_user su ON su.id = na.user_id
+        <include refid="where"/>
+        order by na.id asc
+    </select>
 
     <select id="exportList" resultType="java.util.HashMap">
         SELECT

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

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -24,21 +25,21 @@ public interface INonStandardValueService extends IService<NonStandardValue> {
 	 * @param pageQuery 非标产值信息分页
 	 * @return IPage<NoneStandardValue>
 	 */
-	BaseResponse<IPage<NonStandardValueVo>> getPage (PageQuery pageQuery,Integer userId,Integer status);
+	BaseResponse<IPage<NonStandardValueVo>> getPage (PageQuery pageQuery,Integer userId,String name);
 
 
 /*	//计算每个用户提交的非标产值
 	BaseResponse<List<NonStandardValue>> nonValue(Integer userId);*/
 
 	//计算每个用户提交的非标产值
-	BaseResponse<List<NonStandardValue>> nonValue();
+	BaseResponse<List<NonStandardValue>> nonValue(Date start,Date end);
 
 	/**
 	 * 获取所有非标产值信息
 	 *
 	 * @return List
 	 */
-	BaseResponse<List<NonStandardValue>> getList();
+	BaseResponse<List<NonStandardValueVo>> getList(Date start,Date end);
 
 	/**
 	 * 非标产值列表导出

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

@@ -60,7 +60,6 @@ public class NonStandardApplyServiceImpl extends ServiceImpl<NonStandardApplyMap
 	public BaseResponse<NonStandardApply> create(NonStandardApplyQuery query) {
 		NonStandardApply cama = new NonStandardApply();
 		BeanUtils.copyProperties(query, cama);
-		LocalDate st=cama.getStartTime();
 		Double a=cama.getReportedHours();
 		Double b=a/24+1;
 		long c=new Double(b).longValue();

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

@@ -16,6 +16,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import javax.xml.crypto.Data;
 import java.util.*;
 
 /**
@@ -32,10 +33,10 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
 	private NonStandardValueMapper nonStandardValueMapper;
 
 	@Override
-	public BaseResponse<IPage<NonStandardValueVo>> getPage(PageQuery pageQuery, Integer userId,Integer status) {
+	public BaseResponse<IPage<NonStandardValueVo>> getPage(PageQuery pageQuery, Integer userId,String name) {
 		Map<String, Object> params = new HashMap<>();
 		params.put("userId", userId);
-		params.put("status", status);
+		params.put("name", name);
 		Page<NonStandardValueVo> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
 		IPage<NonStandardValueVo> pages = nonStandardValueMapper.getPage(page,params);
 		return BaseResponse.okData(pages);
@@ -43,13 +44,13 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
 
 	@Override
 	//计算每个用户提交的非标产值
-	public BaseResponse<List<NonStandardValue>> nonValue(){
-		List<NonStandardValue> data = getList().getData();
+	public BaseResponse<List<NonStandardValue>> nonValue(Date start,Date end){
+		List<NonStandardValueVo> data = getList(start,end).getData();
 		//userId去重
 		Set<Integer> ids = new HashSet<>();
 		//循环所有NonStandardValue的集合data,找到每个NonStandardValue.getuserId放到set
 		//知道有多少个不同的userid==>不同的人
-		for (NonStandardValue nonStandardValue:data) {
+		for (NonStandardValueVo nonStandardValue:data) {
 			Integer userId1 = nonStandardValue.getUserId();
 			ids.add(userId1);
 		}
@@ -67,27 +68,32 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
 			finalNonStandardValue.setReportedHours(0D);
 			finalNonStandardValue.setFinalValue(0D);
 			//todo 为当前userID创建一天展示的产值对象 new 产值对象 ===>传出
-			for (NonStandardValue nonStandardValue:data) {
+			for (NonStandardValueVo nonStandardValue:data) {
 				//每一次进来拿到都是李国国企的一条记录
 				if (nonStandardValue.getUserId().intValue()==userId1) {
 
 					//其他不需要累加的数据==> 比如名字
 					finalNonStandardValue.setStatistical(nonStandardValue.getStatistical());
-					finalNonStandardValue.setAppraisalValue(nonStandardValue.getAppraisalValue());
+					finalNonStandardValue.setAppraisalValue(nonStandardValue.getAppraisalValue().doubleValue());
+					finalNonStandardValue.setUserId(nonStandardValue.getUserId());
+					finalNonStandardValue.setStartTime(nonStandardValue.getStartTime());
+					finalNonStandardValue.setWorkType(nonStandardValue.getWorkType());
+					finalNonStandardValue.setWorkDescription(nonStandardValue.getWorkDescription());
+					finalNonStandardValue.setStatus(nonStandardValue.getStatus());
 					finalNonStandardValue.setUserId(nonStandardValue.getUserId());
-/*					finalNonStandardValue.setName(nonStandardValue.getName());
-					finalNonStandardValue.setAccount(nonStandardValue.getAccount());*/
+					finalNonStandardValue.setName(nonStandardValue.getName());
+					finalNonStandardValue.setAccount(nonStandardValue.getAccount());
 
 					Integer newId=finalNonStandardValue.getId()+1;
 					finalNonStandardValue.setId(newId);
 
 					//只要进来这个if ===> 我拿到了李国庆的其中一条记录
-					Double houers = nonStandardValue.getReportedHours();
+					Double houers = nonStandardValue.getReportedHours().doubleValue();
 					Double newReportHours=nonStandardValue.getReportedHours() + finalNonStandardValue.getReportedHours();
 					//用新得到的最总工时覆盖掉原来的总工时===>累加
 					finalNonStandardValue.setReportedHours(newReportHours);
 
-					Double finalValue = nonStandardValue.getFinalValue();
+					Double finalValue = nonStandardValue.getFinalValue().doubleValue();
 					Double newFinalValue = nonStandardValue.getFinalValue() + finalNonStandardValue.getFinalValue();
 					finalNonStandardValue.setFinalValue(newFinalValue);
 				}
@@ -99,10 +105,11 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
 
 
 	@Override
-	public BaseResponse<List<NonStandardValue>> getList() {
-		QueryWrapper<NonStandardValue> qw = new QueryWrapper<>();
-		qw.eq("status",2);
-		List<NonStandardValue> list = this.list(qw);
+	public BaseResponse<List<NonStandardValueVo>> getList(Date start,Date end) {
+		Map<String,Object> params=new HashMap<>();
+		params.put("start",start);
+		params.put("end",end);
+		List<NonStandardValueVo> list = nonStandardValueMapper.getList(params);
 		return BaseResponse.okData(list);
 	}