Skip to content

I
ims
提交 cf045d5f 作者: 刘明祎-运维用途
操作

Merge branch 'develop'

上级 94de02b6 480d9f70
正在显示 包含 189 行增加 和 52 行删除
csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/dto/ServiceOrderFormDTO.java
......@@ -78,4 +78,7 @@ public class ServiceOrderFormDTO {
@ApiModelProperty(value = "接单人基本信息")
private UserBaseInfoDTO orderReceive;
@ApiModelProperty(value = "订单项目号")
private String projectCode;
}
csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/dto/ServiceOrderFormDetailsDTO.java
......@@ -116,4 +116,13 @@ public class ServiceOrderFormDetailsDTO {
@ApiModelProperty(value = "1:双方无责 2:发布者责任 3：飞手责任")
private Integer duty;
@ApiModelProperty(value = "订单对应的项目号")
private String projectCode;
@ApiModelProperty(value = "二级服务id")
private Integer inspectionId;
@ApiModelProperty(value = "二级服务名称")
private String inspectionName;
}
csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/vo/RequirementsInfoVO.java
......@@ -201,4 +201,13 @@ public class RequirementsInfoVO implements Serializable {
@ApiModelProperty(value = "管理员操作")
private int teamStatus;
@ApiModelProperty(value = "二级分类id")
private int inspectionId;
@ApiModelProperty(value = "项目号")
private String projectCode;
@ApiModelProperty(value = "二级分类名称")
private String inspectionName;
}
csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/vo/ServiceRequirementsVO.java
......@@ -116,5 +116,9 @@ public class ServiceRequirementsVO implements Serializable {
@ApiModelProperty(value = "订单总共需要多少人")
private Integer requireNum;
@ApiModelProperty(value = "订单项目号")
private String projectCode;
@ApiModelProperty(value = "二级服务分类")
private String inspectionId;
}
csf-common/csf-common-model/src/main/java/com/mmc/csf/release/industry/IndustryTypeDTO.java
......@@ -35,4 +35,6 @@ public class IndustryTypeDTO implements Serializable {
private Date createTime;
@ApiModelProperty(value = "服务列表")
private List<InspectionDTO> inspectionDTOS;
@ApiModelProperty(value = "二级分类名称")
private String inspectionName;
}
kustomization/overlays/dev/kustomization.yaml
......@@ -18,4 +18,4 @@ patches:
images:
- name: REGISTRY/NAMESPACE/IMAGE:TAG
newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
newTag: 2be3719499c95de7b3ec6f387ae1e0dd1e0aa2aa
newTag: edc811d126d2121519b4c1b79231ab57f2a93028
release-service/src/main/java/com/mmc/csf/release/controller/RequirementsController.java
......@@ -234,6 +234,14 @@ public class RequirementsController extends BaseController {
public ResultBody updateTaskUrl(@RequestBody UpdateTaskUrlVO updateTaskUrlVO) {
return requirementsService.updateTaskUrl(updateTaskUrlVO.getTaskUrl(),updateTaskUrlVO.getRequirementsInfoId());
}
@ApiOperation(value = "查看原来图片凭证")
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
@GetMapping("getTaskUrl")
public ResultBody getTaskUrl(@ApiParam(value = "发布服务需求id", required = true) @RequestParam Integer requirementsInfoId) {
return requirementsService.getTaskUrl(requirementsInfoId);
}
@ApiOperation(value = "new——小程序-—发布者--订单结算")
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
@PostMapping("settleAccounts")
......
release-service/src/main/java/com/mmc/csf/release/dao/RequirementsDao.java
......@@ -126,6 +126,7 @@ public interface RequirementsDao {
void updateTaskUrl(@Param("taskUrl") String taskUrl,@Param("requirementsInfoId") Integer requirementsInfoId);
String getTaskUrl(Integer requirementsInfoId);
ServiceFulfilATaskDO fulfilATaskDetails(Integer requirementsInfoId, Integer userAccountId);
void settleAccounts(ServiceSettleAccountsDO settleAccountsDO);
......
release-service/src/main/java/com/mmc/csf/release/entity/requirements/OrderAmountDetailDO.java
......@@ -77,6 +77,12 @@ public class OrderAmountDetailDO implements Serializable {
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date workDate;
@ApiModelProperty(value = "其他")
private BigDecimal otherSubsidy;
@ApiModelProperty(value = "备注，解释为什么有其他费用")
private String remark;
private static final long serialVersionUID = 1L;
/**
......
release-service/src/main/java/com/mmc/csf/release/entity/requirements/RequirementsInfoDO.java
......@@ -189,6 +189,12 @@ public class RequirementsInfoDO implements Serializable {
@ApiModelProperty(value = "管理员操作")
private int teamStatus;
@ApiModelProperty(value = "二级分类id")
private int inspectionId;
@ApiModelProperty(value = "项目号")
private String projectCode;
public RequirementsInfoVO buildRequirementsInfoVO() {
return RequirementsInfoVO.builder().id(this.id).requirementTypeId(this.requirementTypeId).userAccountId(this.userAccountId).publishName(this.publishName)
.publishPhone(this.publishPhone).requireDescription(this.requireDescription).solved(this.solved).taskStartTime(this.taskStartTime).taskEndTime(this.taskEndTime)
......@@ -228,6 +234,8 @@ public class RequirementsInfoDO implements Serializable {
.serviceFlowId(this.serviceFlowId)
.teamStatus(this.teamStatus)
.tempId(this.tempId)
.inspectionId(this.inspectionId)
.projectCode(this.projectCode)
.build();
}
......
release-service/src/main/java/com/mmc/csf/release/entity/requirements/ServiceOrderFormDO.java
......@@ -72,6 +72,9 @@ public class ServiceOrderFormDO {
@ApiModelProperty(value = "父订单id")
private Integer fatherRequireId;
@ApiModelProperty(value = "订单对应项目号")
private String projectCode;
public ServiceOrderFormDTO buildServiceOrderForm() {
return ServiceOrderFormDTO.builder()
.id(this.id)
......@@ -89,6 +92,7 @@ public class ServiceOrderFormDO {
.orderStatus(this.orderStatus)
.waiting(this.waiting)
.fatherRequireId(this.fatherRequireId)
.projectCode(this.projectCode)
.build();
}
......
release-service/src/main/java/com/mmc/csf/release/entity/requirements/ServiceOrderFormDetailsDO.java
......@@ -113,6 +113,11 @@ public class ServiceOrderFormDetailsDO {
private Integer duty;
@ApiModelProperty(value = "订单对应的项目号")
private String projectCode;
@ApiModelProperty(value = "二级服务id")
private Integer inspectionId;
public ServiceOrderFormDetailsDTO buildOrderFormDetails() {
......@@ -143,6 +148,8 @@ public class ServiceOrderFormDetailsDO {
.orderEarnings(this.orderEarnings)
.duty(this.duty)
.decisionContent(this.decisionContent)
.projectCode(this.projectCode)
.inspectionId(this.inspectionId)
.build();
}
}
release-service/src/main/java/com/mmc/csf/release/entity/requirements/ServiceRequirementsDO.java
......@@ -148,6 +148,11 @@ public class ServiceRequirementsDO {
@ApiModelProperty(value = "订单总共所需多少人")
private Integer requireNum;
@ApiModelProperty(value = "订单项目号")
private String projectCode;
@ApiModelProperty(value = "二级服务分类")
private String inspectionId;
public ServiceRequirementsDO(ServiceRequirementsVO serviceRequirementsVO) {
this.id = serviceRequirementsVO.getId();
this.userAccountId = serviceRequirementsVO.getUserAccountId();
......@@ -175,6 +180,8 @@ public class ServiceRequirementsDO {
this.cityCode = serviceRequirementsVO.getCityCode();
this.districtCode = serviceRequirementsVO.getDistrictCode();
this.requireNum = serviceRequirementsVO.getRequireNum();
this.projectCode = serviceRequirementsVO.getProjectCode();
this.inspectionId = serviceRequirementsVO.getInspectionId();
}
......
release-service/src/main/java/com/mmc/csf/release/entity/requirements/ServiceRequirementsSonDO.java
......@@ -148,6 +148,11 @@ public class ServiceRequirementsSonDO {
@ApiModelProperty(value = "上级订单id")
private Integer fatherRequireId;
@ApiModelProperty(value = "订单项目号")
private String projectCode;
@ApiModelProperty(value = "二级服务分类")
private String inspectionId;
public ServiceRequirementsSonDO(ServiceRequirementsDO serviceRequirementsDO) {
BigDecimal decimalSum = new BigDecimal(serviceRequirementsDO.getRequireNum());
this.serviceId = serviceRequirementsDO.getServiceId();
......@@ -184,5 +189,7 @@ public class ServiceRequirementsSonDO {
this.serviceName = serviceRequirementsDO.getServiceName();
this.requireNum = 1;
this.fatherRequireId = serviceRequirementsDO.getId();
this.projectCode = serviceRequirementsDO.getProjectCode();
this.inspectionId = serviceRequirementsDO.getInspectionId();
}
}
release-service/src/main/java/com/mmc/csf/release/service/RequirementsService.java
......@@ -90,6 +90,7 @@ public interface RequirementsService {
ResultBody updateTaskUrl(String taskUrl,Integer requirementsInfoId);
ResultBody getTaskUrl(Integer requirementsInfoId);
ResultBody<ServiceFulfilATaskDTO> fulfilATaskDetails(Integer requirementsInfoId, Integer userAccountId);
ResultBody settleAccounts(ServiceSettleAccountsVO settleAccountsVO, HttpServletRequest request);
......
release-service/src/main/java/com/mmc/csf/release/service/impl/BackRequirementsServiceImpl.java
package com.mmc.csf.release.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.mmc.csf.common.util.page.PageResult;
import com.mmc.csf.common.util.web.ResultBody;
import com.mmc.csf.config.IsNullConvertZeroUtil;
......@@ -16,11 +17,15 @@ import com.mmc.csf.release.entity.requirements.ServiceOrderFormDO;
import com.mmc.csf.release.entity.requirements.ServiceOrderFormDetailsDO;
import com.mmc.csf.release.enums.ServiceIdEnum;
import com.mmc.csf.release.feign.UserAppApi;
import com.mmc.csf.release.industry.IndustryTypeDTO;
import com.mmc.csf.release.service.BackRequirementsService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.*;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.client.RestTemplate;
import java.math.BigDecimal;
import java.util.List;
......@@ -43,11 +48,15 @@ public class BackRequirementsServiceImpl implements BackRequirementsService {
private RequirementsDao requirementsDao;
@Autowired
private RestTemplate restTemplate;
@Autowired
private UserAppApi userAppApi;
@Autowired
private OrderAmountDetailDao orderAmountDetailDao;
@Value("${iuav.pmsapp.url}")
private String pmsApp;
@Override
public PageResult serviceOrderFormList(ServiceOrderQO param, LoginSuccessDTO userLoginInfoFromRedis) {
......@@ -145,6 +154,11 @@ public class BackRequirementsServiceImpl implements BackRequirementsService {
}
ServiceOrderFormDetailsDO orderFormDetailsDO = backRequirementsDao.serviceOrderFormDetails(requirementsInfoId);
ServiceOrderFormDetailsDTO serviceOrderFormDetailsDTO = orderFormDetailsDO.buildOrderFormDetails();
IndustryTypeDTO industryTypeDTO = getIndustryTypeById(serviceOrderFormDetailsDTO.getServiceId(),serviceOrderFormDetailsDTO.getInspectionId());
serviceOrderFormDetailsDTO.setInspectionName(industryTypeDTO.getInspectionName());
IsNullConvertZeroUtil.checkIsNull(serviceOrderFormDetailsDTO);
requireEveryStatusVO.setServiceOrderFormDetailsDTO(serviceOrderFormDetailsDTO);
......@@ -193,4 +207,20 @@ public class BackRequirementsServiceImpl implements BackRequirementsService {
orderAmountDetailDao.batchInsert(list);
return ResultBody.success();
}
public IndustryTypeDTO getIndustryTypeById(Integer serviceId, Integer inspectionId) {
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON);
HttpEntity<String> entity = new HttpEntity<>(null, headers);
String url = null;
if(inspectionId!=null){
url = String.format("%s/pms/industry/getIndustryTypeById?id=%s&inspectionId=%s", pmsApp, serviceId, inspectionId);
}else {
url = String.format("%s/pms/industry/getIndustryTypeById?id=%s", pmsApp, serviceId);
}
ResponseEntity<String> exchange = restTemplate.exchange(url, HttpMethod.GET, entity, String.class);
String body = exchange.getBody();
IndustryTypeDTO industryTypeDTO = JSONObject.parseObject(body, IndustryTypeDTO.class);
return industryTypeDTO;
}
}
release-service/src/main/java/com/mmc/csf/release/service/impl/BackstageForumServiceImpl.java
......@@ -222,7 +222,8 @@ public class BackstageForumServiceImpl implements BackstageForumService {
WxMsgVO ws = new WxMsgVO();
ws.setDataObject(spellMsg("发布帖子","审核通过"));
ws.setUserAccountId(dynamicDO.getUserAccountId());
ws.setTemplateId("9qvgBhfW9yoQJY91iMfhrog8y5eZUPSbo9PLvQzS_vk");
// ws.setTemplateId("9qvgBhfW9yoQJY91iMfhrog8y5eZUPSbo9PLvQzS_vk");
ws.setTemplateId("4s0xcovQfT89MYPkUEesBsPD_ONRMPsx_9jxi61Qd-c");
userAppApi.feignSendWxMsg(token, ws);
} else {
dynamicDao.updateCheckDynamic(dynamicId, 2);
......
release-service/src/main/java/com/mmc/csf/release/service/impl/RequirementsServiceImpl.java
......@@ -249,8 +249,9 @@ public class RequirementsServiceImpl implements RequirementsService {
requirementsInfoVO.setPublishAccountId(requirementsInfoDO.getUserAccountId());
requirementsInfoVO.setRequirementsInfoId(requirementsInfoDO.getId());
//IndustryTypeDTO industryTypeDTO = pmsAppApi.feignQquerygetIndustryTypeById(requirementsInfoVO.getServiceId());
IndustryTypeDTO industryTypeDTO = getIndustryTypeById(requirementsInfoVO.getServiceId());
IndustryTypeDTO industryTypeDTO = getIndustryTypeById(requirementsInfoVO.getServiceId(),requirementsInfoVO.getInspectionId());
requirementsInfoVO.setServiceName(industryTypeDTO.getTypeName());
requirementsInfoVO.setInspectionName(industryTypeDTO.getInspectionName());
//已经支付
String s = stringRedisTemplate.opsForValue().get(requirementsInfoDO.getId().toString());
RequirementsInfoVO orderVO = JSON.parseObject(s, RequirementsInfoVO.class);
......@@ -2318,7 +2319,7 @@ public class RequirementsServiceImpl implements RequirementsService {
if (tempTotalAmount.compareTo(BigDecimal.ZERO) == 0) {
requirementsDao.InsertRequirementsAmountLog(requirementsInfoDO);
IndustryTypeDTO industryTypeDTO = getIndustryTypeById(requirementsEditVO.getServiceId());
IndustryTypeDTO industryTypeDTO = getIndustryTypeById(requirementsEditVO.getServiceId(),null);
infoDO.setServiceName(industryTypeDTO.getTypeName());
requirementsDao.updateRequirementsInfo(infoDO);
BigDecimal add = amountDO.getOrderAmount().add(requirementsInfoDO.getOrderLevelAmount());
......@@ -2552,14 +2553,15 @@ public class RequirementsServiceImpl implements RequirementsService {
//这个是几个人的订单
Integer sum = serviceRequirementsVO.getRequireNum();
//获取用户基本信息
UserAccountSimpleDTO userAccountSimpleDTO = feignGetUserSimpleInfo(serviceRequirementsVO.getUserAccountId(), request);
Integer userAccountId = serviceRequirementsVO.getUserAccountId();
UserAccountSimpleDTO userAccountSimpleDTO = feignGetUserSimpleInfo(userAccountId, request);
String openid = userAccountSimpleDTO.getOpenid();
//需要冻结的金额
WalletFlowVO walletFlowVO = new WalletFlowVO();
// PublisherWalletFlowVO publisherWalletFlowVO = walletFlowVO.getPublisherWalletFlowVO();
PublisherWalletFlowVO publisherWalletFlowVO = new PublisherWalletFlowVO();
publisherWalletFlowVO.setUserAccountId(serviceRequirementsVO.getUserAccountId());
publisherWalletFlowVO.setOperateUserAccountId(serviceRequirementsVO.getUserAccountId());
publisherWalletFlowVO.setUserAccountId(userAccountId);
publisherWalletFlowVO.setOperateUserAccountId(userAccountId);
ServiceRequirementsDO requirementsInfoDO = new ServiceRequirementsDO(serviceRequirementsVO);
requirementsInfoDO.setPublisherNumber(randomOrderCode());
IsNullConvertZeroUtil.checkIsNull(publisherWalletFlowVO);
......@@ -2818,7 +2820,7 @@ public class RequirementsServiceImpl implements RequirementsService {
}
}
}
IndustryTypeDTO industryTypeDTO = getIndustryTypeById(requirementsInfoDO.getServiceId());
IndustryTypeDTO industryTypeDTO = getIndustryTypeById(requirementsInfoDO.getServiceId(),null);
requirementsInfoDO.setServiceName(industryTypeDTO.getTypeName());
requirementsInfoDO.setOpenid(openid);
// sum是1说明订单只需一个人 sum>1 说明是多人需要创建子订单
......@@ -3177,33 +3179,38 @@ public class RequirementsServiceImpl implements RequirementsService {
return ResultBody.error("没有查到这个订单");
}
String taskUrl1 = serviceFulfilATaskDO.getTaskUrl();
if(StringUtils.isEmpty(taskUrl1)){
String newTaskUrl = taskUrl;
requirementsDao.updateTaskUrl(newTaskUrl,requirementsInfoId);
return ResultBody.success();
}
taskUrl = taskUrl.replace("\\","");
// 解析为JSON数组
JsonArray jsonArray1 = new Gson().fromJson(taskUrl1, JsonArray.class);
JsonArray jsonArray2 = new Gson().fromJson(taskUrl, JsonArray.class);
// 合并JSON数组
JsonArray mergedArray = new JsonArray();
for (int i = 0; i < jsonArray1.size(); i++) {
mergedArray.add(jsonArray1.get(i));
}
for (int i = 0; i < jsonArray2.size(); i++) {
mergedArray.add(jsonArray2.get(i));
}
// 转换为字符串形式
String newTaskUrl = mergedArray.toString();
requirementsDao.updateTaskUrl(newTaskUrl,requirementsInfoId);
// String taskUrl1 = serviceFulfilATaskDO.getTaskUrl();
// if(StringUtils.isEmpty(taskUrl1)){
// String newTaskUrl = taskUrl;
// requirementsDao.updateTaskUrl(newTaskUrl,requirementsInfoId);
// return ResultBody.success();
// }
// taskUrl = taskUrl.replace("\\","");
// // 解析为JSON数组
// JsonArray jsonArray1 = new Gson().fromJson(taskUrl1, JsonArray.class);
// JsonArray jsonArray2 = new Gson().fromJson(taskUrl, JsonArray.class);
//
// // 合并JSON数组
// JsonArray mergedArray = new JsonArray();
// for (int i = 0; i < jsonArray1.size(); i++) {
// mergedArray.add(jsonArray1.get(i));
// }
// for (int i = 0; i < jsonArray2.size(); i++) {
// mergedArray.add(jsonArray2.get(i));
// }
//
// // 转换为字符串形式
// String newTaskUrl = mergedArray.toString();
requirementsDao.updateTaskUrl(taskUrl,requirementsInfoId);
return ResultBody.success();
}
@Override
public ResultBody getTaskUrl(Integer requirementsInfoId) {
return ResultBody.success(requirementsDao.getTaskUrl(requirementsInfoId));
}
@Override
public ResultBody<ServiceFulfilATaskDTO> fulfilATaskDetails(Integer requirementsInfoId, Integer userAccountId) {
ServiceFulfilATaskDO serviceFulfilATaskDO = requirementsDao.fulfilATaskDetails(requirementsInfoId, userAccountId);
ServiceFulfilATaskDTO serviceFulfilATaskDTO = serviceFulfilATaskDO.buildServiceFulfilATaskDTO();
......@@ -3762,11 +3769,17 @@ public class RequirementsServiceImpl implements RequirementsService {
}
public IndustryTypeDTO getIndustryTypeById(Integer serviceId) {
public IndustryTypeDTO getIndustryTypeById(Integer serviceId,Integer inspectionId) {
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON);
HttpEntity<String> entity = new HttpEntity<>(null, headers);
ResponseEntity<String> exchange = restTemplate.exchange(pmsApp + "/pms/industry/getIndustryTypeById?id=+" + serviceId, HttpMethod.GET, entity, String.class);
String url = null;
if(inspectionId!=null){
url = String.format("%s/pms/industry/getIndustryTypeById?id=%s&inspectionId=%s", pmsApp, serviceId, inspectionId);
}else {
url = String.format("%s/pms/industry/getIndustryTypeById?id=%s", pmsApp, serviceId);
}
ResponseEntity<String> exchange = restTemplate.exchange(url, HttpMethod.GET, entity, String.class);
String body = exchange.getBody();
IndustryTypeDTO industryTypeDTO = JSONObject.parseObject(body, IndustryTypeDTO.class);
return industryTypeDTO;
......
release-service/src/main/resources/application-dev.yml
......@@ -78,8 +78,8 @@ spring:
wx:
sub:
appid: wx5c6a105a0ddca4c5
secret: 96c75255dd26f82f8d55e15b59e101c7
appid: wx50b22db275f8c320
secret: 7b609851705dd22114fff636d0a2fc4a
app:
id: wx18b7883acd204278
secret: 28afe74ba373830237a8133a7431ee82
......
release-service/src/main/resources/application-local.yml
......@@ -77,8 +77,8 @@ spring:
wx:
sub:
appid: wx5c6a105a0ddca4c5
secret: 96c75255dd26f82f8d55e15b59e101c7
appid: wx50b22db275f8c320
secret: 7b609851705dd22114fff636d0a2fc4a
app:
id: wx18b7883acd204278
secret: 28afe74ba373830237a8133a7431ee82
......
release-service/src/main/resources/application-prod.yml
......@@ -132,8 +132,8 @@ ribbon:
wx:
sub:
appid: wx5c6a105a0ddca4c5
secret: ${WECHAT_SUB_SECRET}
appid: wx50b22db275f8c320
secret: 7b609851705dd22114fff636d0a2fc4a
app:
id: wx18b7883acd204278
secret: ${WECHAT_APPLET_SECRET}
......
release-service/src/main/resources/mapper/requirements/BackRequirementsDao.xml
......@@ -70,7 +70,8 @@
ri.service_id,
ri.service_name,
sf.order_status,
sf.waiting
sf.waiting,
ri.project_code
FROM
requirements_info ri
LEFT JOIN requirements_amount ra ON ri.id = ra.requirements_info_id
......@@ -188,6 +189,7 @@
ri.task_address,
ri.latitude,
ri.longitude,
ri.project_code,
ra.cash_amount,
ra.salary_amount,
ra.we_chat,
......@@ -200,7 +202,8 @@
sf.doing,
ra.order_earnings,
csi.decision_content,
csi.duty
csi.duty,
ri.inspection_id
FROM
requirements_info ri
LEFT JOIN requirements_amount ra ON ri.id = ra.requirements_info_id
......
release-service/src/main/resources/mapper/requirements/OrderAmountDetailDao.xml
......@@ -21,7 +21,7 @@
id,requirements_info_id,daily_wage,
subsidy_festival,rental_subsidy,traffic_subsidy,
high_temperature_subsidy,settle_accounts_proportion,real_wages,
work_date,create_time,update_time
work_date,create_time,update_time,other_subsidy,remark
</sql>
......@@ -53,12 +53,12 @@
<insert id="batchInsert" parameterType="java.util.List">
insert into order_amount_detail
(id, requirements_info_id, daily_wage, subsidy_festival, rental_subsidy, traffic_subsidy,
high_temperature_subsidy, settle_accounts_proportion, real_wages, work_date, create_time)
high_temperature_subsidy, settle_accounts_proportion, real_wages, work_date, create_time,other_subsidy,remark)
values
<foreach collection="list" item="item" separator=",">
(#{item.id}, #{item.requirementsInfoId}, #{item.dailyWage}, #{item.subsidyFestival}, #{item.rentalSubsidy},
#{item.trafficSubsidy}, #{item.highTemperatureSubsidy}, #{item.settleAccountsProportion}, #{item.realWages},
#{item.workDate}, NOW())
#{item.workDate}, NOW(),#{item.otherSubsidy},#{item.remark})
</foreach>
</insert>
......
release-service/src/main/resources/mapper/requirements/RequirementsDao.xml
......@@ -501,7 +501,9 @@
rau.url AS afterModificationUrl,
rs.pilot_certification_user_id AS pilotCertificationUserId,
rs.preempt_phone AS preemptPhone,
rs.pilot_certification_id
rs.pilot_certification_id,
ri.inspection_id,
ri.project_code
FROM requirements_info ri
LEFT JOIN requirements_type rt
ON rt.id = ri.requirement_type_id
......@@ -519,12 +521,12 @@
require_description, create_time,
update_time, task_start_time, task_end_time, task_address, longitude,
latitude, publisher_number, insurance, publish,
service_flow_id, adcode, order_level_amount, openid, service_name,province_code,city_code,district_code,require_num,repertory)
service_flow_id, adcode, order_level_amount, openid, service_name,province_code,city_code,district_code,require_num,repertory,project_code,inspection_id)
VALUES (#{serviceId}, #{userAccountId}, #{publishName}, #{publishPhone},
#{requireDescription}, NOW(),
NOW(), #{taskStartTime}, #{taskEndTime}, #{taskAddress}, #{longitude},
#{latitude}, #{publisherNumber}, #{insurance}, 1, 1, #{adcode}, #{orderLevelAmount}, #{openid},
#{serviceName},#{provinceCode},#{cityCode},#{districtCode},#{requireNum},#{repertory});
#{serviceName},#{provinceCode},#{cityCode},#{districtCode},#{requireNum},#{repertory},#{projectCode},#{inspectionId});
</insert>
<insert id="addPublishServiceSon" parameterType="com.mmc.csf.release.entity.requirements.ServiceRequirementsSonDO"
......@@ -533,12 +535,12 @@
require_description, create_time,
update_time, task_start_time, task_end_time, task_address, longitude,
latitude, publisher_number, insurance, publish,
service_flow_id, adcode, order_level_amount, openid, service_name,province_code,city_code,district_code,father_require_id)
service_flow_id, adcode, order_level_amount, openid, service_name,province_code,city_code,district_code,father_require_id,project_code,inspection_id)
VALUES (#{serviceId}, #{userAccountId}, #{publishName}, #{publishPhone},
#{requireDescription}, NOW(),
NOW(), #{taskStartTime}, #{taskEndTime}, #{taskAddress}, #{longitude},
#{latitude}, #{publisherNumber}, #{insurance}, 1, 1, #{adcode}, #{orderLevelAmount}, #{openid},
#{serviceName},#{provinceCode},#{cityCode},#{districtCode},#{fatherRequireId});
#{serviceName},#{provinceCode},#{cityCode},#{districtCode},#{fatherRequireId},#{projectCode},#{inspectionId});
</insert>
<insert id="addAmount" parameterType="com.mmc.csf.release.entity.requirements.RequirementsAmountDO"
......@@ -1702,6 +1704,11 @@
where requirements_info_id = #{requirementsInfoId}
</update>
<select id="getTaskUrl" resultType="java.lang.String">
select task_url from service_fulfil_a_task
where requirements_info_id = #{requirementsInfoId}
</select>
<insert id="insertAgreePilotOrder">
insert into agree_pilot_order(require_info_id, service_flow_id, pilot_certification_user_id, create_time)
values(#{requireInfoId},#{serviceFlowId},#{pilotCertificationUserId},NOW())
......@@ -1782,7 +1789,9 @@
rau.url AS afterModificationUrl,
rs.pilot_certification_user_id AS pilotCertificationUserId,
rs.preempt_phone AS preemptPhone,
rs.pilot_certification_id
rs.pilot_certification_id,
ri.inspection_id,
ri.project_code
FROM requirements_info ri
LEFT JOIN requirements_type rt
ON rt.id = ri.requirement_type_id
......@@ -1871,7 +1880,8 @@
ri.province_code,
ri.city_code,
ri.district_code,
ri.service_flow_id
ri.service_flow_id,
ri.project_code
FROM requirements_info ri
LEFT JOIN requirements_amount ra
ON ra.requirements_info_id = ri.id AND ri.user_account_id = ra.user_account_id
......@@ -2135,7 +2145,9 @@
rau.url AS afterModificationUrl,
rs.pilot_certification_user_id AS pilotCertificationUserId,
rs.pilot_certification_id,
rs.team_status
rs.team_status,
ri.inspection_id,
ri.project_code
FROM requirements_info ri
LEFT JOIN requirements_type rt
ON rt.id = ri.requirement_type_id
......@@ -2196,6 +2208,7 @@
WHERE ri.user_account_id = #{userAccountId}
AND ri.id = #{requirementsInfoId}
</select>
<delete id="deleteRequirementsServiceInfo">
delete from requirements_service where requirements_info_id = #{requireId} and pilot_certification_user_id = #{userAccountId}
</delete>
......
release-service/src/main/resources/not-check.yml
......@@ -48,4 +48,5 @@ data-filter:
- /release/curriculum/curriculumDetails
- /release/backstage/forum/getNotCheckDynamicSum
- /release/dynamic/dynamicList1
- /release/curriculum/selectCurriculumClassify
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论