修改任务列表bug

blade-service-api/blade-dict-api/src/main/java/org/springblade/system/feign/IDictBizClient.java

@@ -42,7 +42,7 @@ public interface IDictBizClient {
 	String GET_VALUE = API_PREFIX + "/dict-biz/get-value";
 	String GET_LIST = API_PREFIX + "/dict-biz/get-list";
 	String GET_ID = API_PREFIX + "/dict-biz/get-id";
-
+	String GET_ONE_VALUE = API_PREFIX + "/dict-biz/get-one-value";
 	/**
 	 * 获取字典实体
 	 *
@@ -81,4 +81,16 @@ public interface IDictBizClient {
 	@GetMapping(GET_ID)
 	R<Long> getId(@RequestParam("code") String code, @RequestParam("dictKey") String dictKey);
 
+	/**
+	 * 获取字典表某一个对应值
+	 *
+	 * @param code    字典编号
+	 * @param dictKey 字典序号
+	 * @return
+	 */
+	@GetMapping(GET_ONE_VALUE)
+	R<String> getOneValue(@RequestParam("code") String code,
+						  @RequestParam("dictKey") String dictKey,
+						  @RequestParam("tenantId") String tenantId);
+
 }

blade-service-api/blade-dict-api/src/main/java/org/springblade/system/feign/IDictBizClientFallback.java

@@ -48,4 +48,9 @@ public class IDictBizClientFallback implements IDictBizClient {
 	public R<Long> getId(String code, String dictKey) {
 		return R.fail("获取数据失败");
 	}
+
+	@Override
+	public R<String> getOneValue(String code, String dictKey, String tenantId) {
+		return R.fail("获取数据失败");
+	}
 }

blade-service-api/blade-mocha-item-api/src/main/java/org/springblade/mocha/entity/PriceBank.java

@@ -225,6 +225,11 @@ public class PriceBank implements Serializable {
 		@ApiModelProperty(value = "美元价格")
 		private BigDecimal greenback;
 	/**
+	 * 美金成本
+	 */
+		@ApiModelProperty(value = "美元成本")
+		private BigDecimal usdCost;
+	/**
 	 * 税率
 	 */
 		@ApiModelProperty(value = "税率")

blade-service-api/blade-project-api/src/main/java/org/springblade/project/entity/ServiceProjectItem.java

@@ -185,6 +185,12 @@ public class ServiceProjectItem extends TenantEntity implements Serializable {
 	private Integer taskStatus;
 
 	/**
+	 * 状态名称
+	 */
+	@TableField(exist = false)
+	private String taskStatusName;
+
+	/**
 	 * 提成
 	 */
 	private BigDecimal commission;

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/controller/PriceItemController.java

@@ -215,13 +215,13 @@ public class PriceItemController extends BladeController {
 					}*/
 
 					priceItemList.forEach(e->{
-						BigDecimal saleMoney=BigDecimal.ZERO;
+						BigDecimal saleMoney = BigDecimal.ZERO;
 						BigDecimal reduce=e.getSalesPrice();
 						BigDecimal freight=BigDecimal.ZERO;
 						BigDecimal label=BigDecimal.ZERO;
 							if(isFreight!=null && isFreight==1)
 							{
-								freight=e.getFreightFees();
+								freight = e.getFreightFees();
 							}
 							if(isLabel!=null && isLabel==1)
 							{
@@ -229,7 +229,7 @@ public class PriceItemController extends BladeController {
 							}
 						saleMoney=(reduce.add(freight)).add(label);
 
-						Map<String,BigDecimal> map=new HashMap<>();
+						Map<String,BigDecimal> map = new HashMap<>();
 						map.put("salePrice",saleMoney);
 						mapList.add(map);
 					});

blade-service/blade-project/src/main/java/org/springblade/project/controller/ProjectController.java

@@ -17,6 +17,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.CollectionUtil;
 import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.project.entity.ServiceProject;
 import org.springblade.project.entity.ServiceProjectFiles;
 import org.springblade.project.entity.ServiceProjectItem;
@@ -28,6 +29,7 @@ import org.springblade.project.service.ServiceProjectService;
 import org.springblade.project.utils.DateUtil;
 import org.springblade.system.entity.Dept;
 import org.springblade.system.entity.Tenant;
+import org.springblade.system.feign.IDictBizClient;
 import org.springblade.system.feign.ISysClient;
 import org.springblade.system.feign.ITenantClient;
 import org.springblade.system.user.entity.User;
@@ -62,6 +64,8 @@ public class ProjectController {
 	private ICorpsDescClient corpsDescClient;//获取客户信息
 	@Autowired
 	private ISysClient iSysClient;//部门
+	@Autowired
+	private IDictBizClient iDictBizClient;//状态
 
 
 	@GetMapping("/list")
@@ -806,7 +810,9 @@ public class ProjectController {
 							 @RequestParam(name = "beginEndTime", required = false) String beginEndTime,
 							 @RequestParam(name = "projectType", required = false) Integer projectType,
 							 @RequestParam(name = "branch", required = false) String branch,
-							 @RequestParam(name = "sysNo", required = false) String sysNo
+							 @RequestParam(name = "sysNo", required = false) String sysNo,
+							 @RequestParam(name = "payStartTime", required = false) String payStartTime,
+							 @RequestParam(name = "payEndTime", required = false) String payEndTime
 	) {
 		List<String> listStatus = Arrays.asList(status.split(","));
 
@@ -821,6 +827,8 @@ public class ProjectController {
 			.le(StringUtils.isNotBlank(beginEndTime), ServiceProjectItem::getBeginTime, beginEndTime)
 			.ge(StringUtils.isNotBlank(actualDateStart), ServiceProjectItem::getActualDate, actualDateStart)
 			.le(StringUtils.isNotBlank(actualDateEnd), ServiceProjectItem::getActualDate, actualDateEnd)
+			.ge(StringUtil.isNotBlank(payStartTime), ServiceProjectItem::getPayTime, payStartTime)
+			.le(StringUtil.isNotBlank(payEndTime), ServiceProjectItem::getPayTime, payEndTime)
 			.like(StringUtils.isNotBlank(sysNo), ServiceProjectItem::getSysNo, sysNo)
 			.orderByDesc(ServiceProjectItem::getCreateTime);
 
@@ -982,16 +990,20 @@ public class ProjectController {
 	/**
 	 * 统计主营业务-任务、提成统计导出
 	 *
-	 * @param beginTimeStart
-	 * @param beginTimeEnd
-	 * @param userName
-	 * @param taskStatus
-	 * @param branch
+	 * @param beginTimeStart	任务统计开始时间
+	 * @param beginTimeEnd		任务统计结束时间
+	 * @param actualDateStart	提成统计开始时间
+	 * @param actualDateEnd		提成统计结束时间
+	 * @param userName			承做人
+	 * @param taskStatus		状态
+	 * @param branch			任务分支
 	 */
 	@GetMapping("/statisticsExport")
 	@ApiOperation(value = "任务 提成统计导出", notes = "任务 提成统计导出")
 	public void statisticsExport(@RequestParam(name = "beginTimeStart", required = false) String beginTimeStart,
 								 @RequestParam(name = "beginTimeEnd", required = false) String beginTimeEnd,
+								 @RequestParam(name = "actualDateStart", required = false) String actualDateStart,
+								 @RequestParam(name = "actualDateEnd", required = false) String actualDateEnd,
 								 @RequestParam(name = "userName", required = false) String userName,
 								 @RequestParam(name = "taskStatus", required = false) String taskStatus,
 								 @RequestParam(name = "branch") String branch,
@@ -1002,7 +1014,9 @@ public class ProjectController {
 		itemLambdaQueryWrapper
 			.eq(ServiceProjectItem::getTenantId, AuthUtil.getTenantId())
 			.ge(StringUtils.isNotBlank(beginTimeStart), ServiceProjectItem::getBeginTime, beginTimeStart)
-			.le(StringUtils.isNotBlank(beginTimeEnd), ServiceProjectItem::getBeginTime, beginTimeEnd);
+			.le(StringUtils.isNotBlank(beginTimeEnd), ServiceProjectItem::getBeginTime, beginTimeEnd)
+			.ge(StringUtils.isNotBlank(actualDateStart), ServiceProjectItem::getActualDate, actualDateStart)
+			.le(StringUtils.isNotBlank(actualDateEnd), ServiceProjectItem::getActualDate, actualDateEnd);
 
 		// 承做人
 		if (StringUtils.isNotBlank(userName)) {
@@ -1011,7 +1025,9 @@ public class ProjectController {
 				itemLambdaQueryWrapper.eq(ObjectUtils.isNotNull(userList), ServiceProjectItem::getUserid, userList.get(0).getId());
 			}
 		}
-		taskStatus = null;
+		if (taskStatus.equals("undefined")){
+			taskStatus = null;
+		}
 		itemLambdaQueryWrapper.orderByDesc(ServiceProjectItem::getUserid)
 			.eq(ServiceProjectItem::getIsDeleted, 0)
 			.eq(StringUtils.isNotBlank(taskStatus), ServiceProjectItem::getStatus, taskStatus)
@@ -1031,6 +1047,12 @@ public class ProjectController {
 				if (userR.isSuccess()) {
 					e.setUserName(userR.getData().getRealName());
 				}
+
+				R<String> taskStatusName = iDictBizClient.getOneValue("task_status", String.valueOf(e.getTaskStatus()), AuthUtil.getTenantId());
+				if (ObjectUtil.isNotEmpty(taskStatusName)){
+					e.setTaskStatusName(taskStatusName.getData());
+				}
+
 			});
 		}
 
@@ -1042,7 +1064,7 @@ public class ProjectController {
 				excel.setBeginTime(e.getBeginTime());
 				excel.setCornName(e.getCornName());
 				excel.setTaskName(e.getPName());
-				excel.setTaskStatus(e.getTaskStatus());
+				excel.setTaskStatus(e.getTaskStatusName());
 				excelList.add(excel);
 			});
 			ExcelUtil.export(response, "任务统计", "任务统计", excelList, StatisticsExcel.class);
@@ -1052,7 +1074,7 @@ public class ProjectController {
 				list.forEach(e -> {
 					CommissionExcel excel = new CommissionExcel();
 					excel.setUserName(e.getUserName());
-					excel.setBeginTime(e.getBeginTime());
+					excel.setBeginTime(e.getActualDate());
 					excel.setCornName(e.getCornName());
 					excel.setTaskName(e.getPName());
 					excel.setCommission(e.getCommission());

blade-service/blade-project/src/main/java/org/springblade/project/excel/CommissionExcel.java

@@ -6,6 +6,7 @@ import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -28,8 +29,9 @@ public class CommissionExcel implements Serializable {
 	/**
 	 * 业务日期
 	 */
-	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
 	@ExcelProperty(value = "业务日期")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	private Date beginTime;
 
 	/**

blade-service/blade-project/src/main/java/org/springblade/project/excel/StatisticsExcel.java

@@ -49,5 +49,5 @@ public class StatisticsExcel implements Serializable {
 	 * 状态
 	 */
 	@ExcelProperty(value = "状态")
-	private Integer taskStatus;
+	private String taskStatus;
 }

blade-service/blade-system/src/main/java/org/springblade/system/feign/DictBizClient.java

@@ -66,4 +66,10 @@ public class DictBizClient implements IDictBizClient {
 		return R.data(service.getId(code, dictKey));
 	}
 
+	@Override
+	@GetMapping(GET_ONE_VALUE)
+	public R<String> getOneValue(String code, String dictKey, String tenantId) {
+		return R.data(service.getOneValue(code, dictKey, tenantId));
+	}
+
 }

blade-service/blade-system/src/main/java/org/springblade/system/mapper/DictBizMapper.java

@@ -70,4 +70,12 @@ public interface DictBizMapper extends BaseMapper<DictBiz> {
 	 */
 	Long getId(String code, String dictKey);
 
+	/**
+	 * 获取字典表某一个对应值
+	 *
+	 * @param code    字典编号
+	 * @param dictKey 字典序号
+	 * @return
+	 */
+	String getOneValue(String code, String dictKey, String tenantId);
 }

blade-service/blade-system/src/main/java/org/springblade/system/mapper/DictBizMapper.xml

@@ -52,5 +52,9 @@
             id
         from blade_dict_biz where code = #{param1} and dict_key = #{param2} and is_deleted = 0
     </select>
-
+    <select id="getOneValue" resultType="java.lang.String">
+        select
+            distinct dict_value
+        from blade_dict_biz where code = #{param1} and dict_key = #{param2} and tenant_id = #{param3} and is_deleted = 0
+    </select>
 </mapper>

blade-service/blade-system/src/main/java/org/springblade/system/service/IDictBizService.java

@@ -108,4 +108,12 @@ public interface IDictBizService extends IService<DictBiz> {
 	 */
 	Long getId(String code, String dictKey);
 
+	/**
+	 * 获取字典表某一个对应值
+	 *
+	 * @param code    字典编号
+	 * @param dictKey 字典序号
+	 * @return
+	 */
+	String getOneValue(String code, String dictKey, String tenantId);
 }

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DictBizServiceImpl.java

@@ -128,4 +128,9 @@ public class DictBizServiceImpl extends ServiceImpl<DictBizMapper, DictBiz> impl
 	public Long getId(String code, String dictKey) {
 		return baseMapper.getId(code, dictKey);
 	}
+
+	@Override
+	public String getOneValue(String code, String dictKey, String tenantId) {
+		return baseMapper.getOneValue(code, dictKey, tenantId);
+	}
 }