yunxi
/
ningxiaWeb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

系统派单页面和后端派单逻辑借口编写

Browse Source
dev-jingling
jingling 9 months ago
parent 0035562d8f
commit db9c11012d
12 changed files with 648 additions and 68 deletions
Show Stats Download Patch File Download Diff File

462
jnpf-java-boot/jnpf-admin/src/main/resources/mapper/RecycleOrderMapper.xml
Unescape View File

@ -1,7 +1,461 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="jnpf.mapper.RecycleOrderMapper">
</mapper>
<resultMap id="BaseResultMap" type="jnpf.entity.RecycleOrderEntity">
<id column="id" jdbcType="VARCHAR" property="id" />
<result column="recycle_station_id" jdbcType="VARCHAR" property="recycleStationId" />
<result column="order_number" jdbcType="VARCHAR" property="orderNumber" />
<result column="order_type_id" jdbcType="VARCHAR" property="orderTypeId" />
<result column="order_amount" jdbcType="DECIMAL" property="orderAmount" />
<result column="order_client_status_id" jdbcType="VARCHAR" property="orderClientStatusId" />
<result column="order_staffs_status_id" jdbcType="VARCHAR" property="orderStaffsStatusId" />
<result column="receive_period" jdbcType="INTEGER" property="receivePeriod" />
<result column="client_id" jdbcType="VARCHAR" property="clientId" />
<result column="client_name" jdbcType="VARCHAR" property="clientName" />
<result column="client_mobile" jdbcType="VARCHAR" property="clientMobile" />
<result column="creator_user_id" jdbcType="VARCHAR" property="creatorUserId" />
<result column="creator_time" jdbcType="TIMESTAMP" property="creatorTime" />
<result column="recycle_address" jdbcType="VARCHAR" property="recycleAddress" />
<result column="appointment_time_start" jdbcType="TIMESTAMP" property="appointmentTimeStart" />
<result column="appointment_time_end" jdbcType="TIMESTAMP" property="appointmentTimeEnd" />
<result column="staffs_id" jdbcType="VARCHAR" property="staffsId" />
<result column="staffs_name" jdbcType="VARCHAR" property="staffsName" />
<result column="consult_time_start" jdbcType="TIMESTAMP" property="consultTimeStart" />
<result column="consult_time_end" jdbcType="TIMESTAMP" property="consultTimeEnd" />
<result column="receive_time" jdbcType="TIMESTAMP" property="receiveTime" />
<result column="settle_time" jdbcType="TIMESTAMP" property="settleTime" />
<result column="remark" jdbcType="VARCHAR" property="remark" />
<result column="star_score" jdbcType="INTEGER" property="starScore" />
<result column="comment" jdbcType="VARCHAR" property="comment" />
<result column="comment_pics" jdbcType="VARCHAR" property="commentPics" />
<result column="response_star" jdbcType="INTEGER" property="responseStar" />
<result column="attitude_star" jdbcType="INTEGER" property="attitudeStar" />
<result column="price_star" jdbcType="INTEGER" property="priceStar" />
<result column="is_user_deleted" jdbcType="INTEGER" property="isUserDeleted" />
<result column="is_deleted" jdbcType="INTEGER" property="isDeleted" />
<result column="undefined1" jdbcType="VARCHAR" property="undefined1" />
<result column="undefined2" jdbcType="VARCHAR" property="undefined2" />
<result column="undefined3" jdbcType="VARCHAR" property="undefined3" />
<result column="undefined4" jdbcType="VARCHAR" property="undefined4" />
<result column="f_flow_id" jdbcType="VARCHAR" property="flowId" />
</resultMap>
<sql id="Base_Column_List">
id, recycle_station_id, order_number, order_type_id, order_amount, order_client_status_id,
order_staffs_status_id, receive_period, client_id, client_name, client_mobile, creator_user_id,
creator_time, recycle_address, appointment_time_start, appointment_time_end, staffs_id,
staffs_name, consult_time_start, consult_time_end, receive_time, settle_time, remark,
star_score, comment, comment_pics, response_star, attitude_star, price_star, is_user_deleted,
is_deleted, undefined1, undefined2, undefined3, undefined4, f_flow_id
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from nx_recycle_order
where id = #{id,jdbcType=VARCHAR}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.String">
delete from nx_recycle_order
where id = #{id,jdbcType=VARCHAR}
</delete>
<insert id="insert" parameterType="jnpf.entity.RecycleOrderEntity">
insert into nx_recycle_order (id, recycle_station_id, order_number,
order_type_id, order_amount, order_client_status_id,
order_staffs_status_id, receive_period, client_id,
client_name, client_mobile, creator_user_id,
creator_time, recycle_address, appointment_time_start,
appointment_time_end, staffs_id, staffs_name,
consult_time_start, consult_time_end, receive_time,
settle_time, remark, star_score,
comment, comment_pics, response_star,
attitude_star, price_star, is_user_deleted,
is_deleted, undefined1, undefined2,
undefined3, undefined4, f_flow_id
)
values (#{id,jdbcType=VARCHAR}, #{recycleStationId,jdbcType=VARCHAR}, #{orderNumber,jdbcType=VARCHAR},
#{orderTypeId,jdbcType=VARCHAR}, #{orderAmount,jdbcType=DECIMAL}, #{orderClientStatusId,jdbcType=VARCHAR},
#{orderStaffsStatusId,jdbcType=VARCHAR}, #{receivePeriod,jdbcType=INTEGER}, #{clientId,jdbcType=VARCHAR},
#{clientName,jdbcType=VARCHAR}, #{clientMobile,jdbcType=VARCHAR}, #{creatorUserId,jdbcType=VARCHAR},
#{creatorTime,jdbcType=TIMESTAMP}, #{recycleAddress,jdbcType=VARCHAR}, #{appointmentTimeStart,jdbcType=TIMESTAMP},
#{appointmentTimeEnd,jdbcType=TIMESTAMP}, #{staffsId,jdbcType=VARCHAR}, #{staffsName,jdbcType=VARCHAR},
#{consultTimeStart,jdbcType=TIMESTAMP}, #{consultTimeEnd,jdbcType=TIMESTAMP}, #{receiveTime,jdbcType=TIMESTAMP},
#{settleTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR}, #{starScore,jdbcType=INTEGER},
#{comment,jdbcType=VARCHAR}, #{commentPics,jdbcType=VARCHAR}, #{responseStar,jdbcType=INTEGER},
#{attitudeStar,jdbcType=INTEGER}, #{priceStar,jdbcType=INTEGER}, #{isUserDeleted,jdbcType=INTEGER},
#{isDeleted,jdbcType=INTEGER}, #{undefined1,jdbcType=VARCHAR}, #{undefined2,jdbcType=VARCHAR},
#{undefined3,jdbcType=VARCHAR}, #{undefined4,jdbcType=VARCHAR}, #{flowId,jdbcType=VARCHAR}
)
</insert>
<insert id="insertSelective" parameterType="jnpf.entity.RecycleOrderEntity">
insert into nx_recycle_order
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="recycleStationId != null">
recycle_station_id,
</if>
<if test="orderNumber != null">
order_number,
</if>
<if test="orderTypeId != null">
order_type_id,
</if>
<if test="orderAmount != null">
order_amount,
</if>
<if test="orderClientStatusId != null">
order_client_status_id,
</if>
<if test="orderStaffsStatusId != null">
order_staffs_status_id,
</if>
<if test="receivePeriod != null">
receive_period,
</if>
<if test="clientId != null">
client_id,
</if>
<if test="clientName != null">
client_name,
</if>
<if test="clientMobile != null">
client_mobile,
</if>
<if test="creatorUserId != null">
creator_user_id,
</if>
<if test="creatorTime != null">
creator_time,
</if>
<if test="recycleAddress != null">
recycle_address,
</if>
<if test="appointmentTimeStart != null">
appointment_time_start,
</if>
<if test="appointmentTimeEnd != null">
appointment_time_end,
</if>
<if test="staffsId != null">
staffs_id,
</if>
<if test="staffsName != null">
staffs_name,
</if>
<if test="consultTimeStart != null">
consult_time_start,
</if>
<if test="consultTimeEnd != null">
consult_time_end,
</if>
<if test="receiveTime != null">
receive_time,
</if>
<if test="settleTime != null">
settle_time,
</if>
<if test="remark != null">
remark,
</if>
<if test="starScore != null">
star_score,
</if>
<if test="comment != null">
comment,
</if>
<if test="commentPics != null">
comment_pics,
</if>
<if test="responseStar != null">
response_star,
</if>
<if test="attitudeStar != null">
attitude_star,
</if>
<if test="priceStar != null">
price_star,
</if>
<if test="isUserDeleted != null">
is_user_deleted,
</if>
<if test="isDeleted != null">
is_deleted,
</if>
<if test="undefined1 != null">
undefined1,
</if>
<if test="undefined2 != null">
undefined2,
</if>
<if test="undefined3 != null">
undefined3,
</if>
<if test="undefined4 != null">
undefined4,
</if>
<if test="flowId != null">
f_flow_id,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=VARCHAR},
</if>
<if test="recycleStationId != null">
#{recycleStationId,jdbcType=VARCHAR},
</if>
<if test="orderNumber != null">
#{orderNumber,jdbcType=VARCHAR},
</if>
<if test="orderTypeId != null">
#{orderTypeId,jdbcType=VARCHAR},
</if>
<if test="orderAmount != null">
#{orderAmount,jdbcType=DECIMAL},
</if>
<if test="orderClientStatusId != null">
#{orderClientStatusId,jdbcType=VARCHAR},
</if>
<if test="orderStaffsStatusId != null">
#{orderStaffsStatusId,jdbcType=VARCHAR},
</if>
<if test="receivePeriod != null">
#{receivePeriod,jdbcType=INTEGER},
</if>
<if test="clientId != null">
#{clientId,jdbcType=VARCHAR},
</if>
<if test="clientName != null">
#{clientName,jdbcType=VARCHAR},
</if>
<if test="clientMobile != null">
#{clientMobile,jdbcType=VARCHAR},
</if>
<if test="creatorUserId != null">
#{creatorUserId,jdbcType=VARCHAR},
</if>
<if test="creatorTime != null">
#{creatorTime,jdbcType=TIMESTAMP},
</if>
<if test="recycleAddress != null">
#{recycleAddress,jdbcType=VARCHAR},
</if>
<if test="appointmentTimeStart != null">
#{appointmentTimeStart,jdbcType=TIMESTAMP},
</if>
<if test="appointmentTimeEnd != null">
#{appointmentTimeEnd,jdbcType=TIMESTAMP},
</if>
<if test="staffsId != null">
#{staffsId,jdbcType=VARCHAR},
</if>
<if test="staffsName != null">
#{staffsName,jdbcType=VARCHAR},
</if>
<if test="consultTimeStart != null">
#{consultTimeStart,jdbcType=TIMESTAMP},
</if>
<if test="consultTimeEnd != null">
#{consultTimeEnd,jdbcType=TIMESTAMP},
</if>
<if test="receiveTime != null">
#{receiveTime,jdbcType=TIMESTAMP},
</if>
<if test="settleTime != null">
#{settleTime,jdbcType=TIMESTAMP},
</if>
<if test="remark != null">
#{remark,jdbcType=VARCHAR},
</if>
<if test="starScore != null">
#{starScore,jdbcType=INTEGER},
</if>
<if test="comment != null">
#{comment,jdbcType=VARCHAR},
</if>
<if test="commentPics != null">
#{commentPics,jdbcType=VARCHAR},
</if>
<if test="responseStar != null">
#{responseStar,jdbcType=INTEGER},
</if>
<if test="attitudeStar != null">
#{attitudeStar,jdbcType=INTEGER},
</if>
<if test="priceStar != null">
#{priceStar,jdbcType=INTEGER},
</if>
<if test="isUserDeleted != null">
#{isUserDeleted,jdbcType=INTEGER},
</if>
<if test="isDeleted != null">
#{isDeleted,jdbcType=INTEGER},
</if>
<if test="undefined1 != null">
#{undefined1,jdbcType=VARCHAR},
</if>
<if test="undefined2 != null">
#{undefined2,jdbcType=VARCHAR},
</if>
<if test="undefined3 != null">
#{undefined3,jdbcType=VARCHAR},
</if>
<if test="undefined4 != null">
#{undefined4,jdbcType=VARCHAR},
</if>
<if test="flowId != null">
#{flowId,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="jnpf.entity.RecycleOrderEntity">
update nx_recycle_order
<set>
<if test="recycleStationId != null">
recycle_station_id = #{recycleStationId,jdbcType=VARCHAR},
</if>
<if test="orderNumber != null">
order_number = #{orderNumber,jdbcType=VARCHAR},
</if>
<if test="orderTypeId != null">
order_type_id = #{orderTypeId,jdbcType=VARCHAR},
</if>
<if test="orderAmount != null">
order_amount = #{orderAmount,jdbcType=DECIMAL},
</if>
<if test="orderClientStatusId != null">
order_client_status_id = #{orderClientStatusId,jdbcType=VARCHAR},
</if>
<if test="orderStaffsStatusId != null">
order_staffs_status_id = #{orderStaffsStatusId,jdbcType=VARCHAR},
</if>
<if test="receivePeriod != null">
receive_period = #{receivePeriod,jdbcType=INTEGER},
</if>
<if test="clientId != null">
client_id = #{clientId,jdbcType=VARCHAR},
</if>
<if test="clientName != null">
client_name = #{clientName,jdbcType=VARCHAR},
</if>
<if test="clientMobile != null">
client_mobile = #{clientMobile,jdbcType=VARCHAR},
</if>
<if test="creatorUserId != null">
creator_user_id = #{creatorUserId,jdbcType=VARCHAR},
</if>
<if test="creatorTime != null">
creator_time = #{creatorTime,jdbcType=TIMESTAMP},
</if>
<if test="recycleAddress != null">
recycle_address = #{recycleAddress,jdbcType=VARCHAR},
</if>
<if test="appointmentTimeStart != null">
appointment_time_start = #{appointmentTimeStart,jdbcType=TIMESTAMP},
</if>
<if test="appointmentTimeEnd != null">
appointment_time_end = #{appointmentTimeEnd,jdbcType=TIMESTAMP},
</if>
<if test="staffsId != null">
staffs_id = #{staffsId,jdbcType=VARCHAR},
</if>
<if test="staffsName != null">
staffs_name = #{staffsName,jdbcType=VARCHAR},
</if>
<if test="consultTimeStart != null">
consult_time_start = #{consultTimeStart,jdbcType=TIMESTAMP},
</if>
<if test="consultTimeEnd != null">
consult_time_end = #{consultTimeEnd,jdbcType=TIMESTAMP},
</if>
<if test="receiveTime != null">
receive_time = #{receiveTime,jdbcType=TIMESTAMP},
</if>
<if test="settleTime != null">
settle_time = #{settleTime,jdbcType=TIMESTAMP},
</if>
<if test="remark != null">
remark = #{remark,jdbcType=VARCHAR},
</if>
<if test="starScore != null">
star_score = #{starScore,jdbcType=INTEGER},
</if>
<if test="comment != null">
comment = #{comment,jdbcType=VARCHAR},
</if>
<if test="commentPics != null">
comment_pics = #{commentPics,jdbcType=VARCHAR},
</if>
<if test="responseStar != null">
response_star = #{responseStar,jdbcType=INTEGER},
</if>
<if test="attitudeStar != null">
attitude_star = #{attitudeStar,jdbcType=INTEGER},
</if>
<if test="priceStar != null">
price_star = #{priceStar,jdbcType=INTEGER},
</if>
<if test="isUserDeleted != null">
is_user_deleted = #{isUserDeleted,jdbcType=INTEGER},
</if>
<if test="isDeleted != null">
is_deleted = #{isDeleted,jdbcType=INTEGER},
</if>
<if test="undefined1 != null">
undefined1 = #{undefined1,jdbcType=VARCHAR},
</if>
<if test="undefined2 != null">
undefined2 = #{undefined2,jdbcType=VARCHAR},
</if>
<if test="undefined3 != null">
undefined3 = #{undefined3,jdbcType=VARCHAR},
</if>
<if test="undefined4 != null">
undefined4 = #{undefined4,jdbcType=VARCHAR},
</if>
<if test="flowId != null">
f_flow_id = #{flowId,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=VARCHAR}
</update>
<update id="updateByPrimaryKey" parameterType="jnpf.entity.RecycleOrderEntity">
update nx_recycle_order
set recycle_station_id = #{recycleStationId,jdbcType=VARCHAR},
order_number = #{orderNumber,jdbcType=VARCHAR},
order_type_id = #{orderTypeId,jdbcType=VARCHAR},
order_amount = #{orderAmount,jdbcType=DECIMAL},
order_client_status_id = #{orderClientStatusId,jdbcType=VARCHAR},
order_staffs_status_id = #{orderStaffsStatusId,jdbcType=VARCHAR},
receive_period = #{receivePeriod,jdbcType=INTEGER},
client_id = #{clientId,jdbcType=VARCHAR},
client_name = #{clientName,jdbcType=VARCHAR},
client_mobile = #{clientMobile,jdbcType=VARCHAR},
creator_user_id = #{creatorUserId,jdbcType=VARCHAR},
creator_time = #{creatorTime,jdbcType=TIMESTAMP},
recycle_address = #{recycleAddress,jdbcType=VARCHAR},
appointment_time_start = #{appointmentTimeStart,jdbcType=TIMESTAMP},
appointment_time_end = #{appointmentTimeEnd,jdbcType=TIMESTAMP},
staffs_id = #{staffsId,jdbcType=VARCHAR},
staffs_name = #{staffsName,jdbcType=VARCHAR},
consult_time_start = #{consultTimeStart,jdbcType=TIMESTAMP},
consult_time_end = #{consultTimeEnd,jdbcType=TIMESTAMP},
receive_time = #{receiveTime,jdbcType=TIMESTAMP},
settle_time = #{settleTime,jdbcType=TIMESTAMP},
remark = #{remark,jdbcType=VARCHAR},
star_score = #{starScore,jdbcType=INTEGER},
comment = #{comment,jdbcType=VARCHAR},
comment_pics = #{commentPics,jdbcType=VARCHAR},
response_star = #{responseStar,jdbcType=INTEGER},
attitude_star = #{attitudeStar,jdbcType=INTEGER},
price_star = #{priceStar,jdbcType=INTEGER},
is_user_deleted = #{isUserDeleted,jdbcType=INTEGER},
is_deleted = #{isDeleted,jdbcType=INTEGER},
undefined1 = #{undefined1,jdbcType=VARCHAR},
undefined2 = #{undefined2,jdbcType=VARCHAR},
undefined3 = #{undefined3,jdbcType=VARCHAR},
undefined4 = #{undefined4,jdbcType=VARCHAR},
f_flow_id = #{flowId,jdbcType=VARCHAR}
where id = #{id,jdbcType=VARCHAR}
</update>
</mapper>

10
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/RecycleOrderMapper.java
Unescape View File

@ -12,5 +12,15 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* 日期： 2024-02-01
*/
public interface RecycleOrderMapper extends BaseMapper<RecycleOrderEntity> {
int deleteByPrimaryKey(String id);
int insert(RecycleOrderEntity row);
int insertSelective(RecycleOrderEntity row);
RecycleOrderEntity selectByPrimaryKey(String id);
int updateByPrimaryKeySelective(RecycleOrderEntity row);
int updateByPrimaryKey(RecycleOrderEntity row);
}

9
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/NxRecycleOrderService.java
Unescape View File

@ -0,0 +1,9 @@
package jnpf.service;
import jnpf.entity.RecycleOrderEntity;
public interface NxRecycleOrderService {
int updateByPrimaryKeySelective(RecycleOrderEntity row);
}

20
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/NxRecycleOrderServiceImpl.java
Unescape View File

@ -0,0 +1,20 @@
package jnpf.service.impl;
import jnpf.entity.RecycleOrderEntity;
import jnpf.mapper.RecycleOrderMapper;
import jnpf.service.NxRecycleOrderService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@Service
public class NxRecycleOrderServiceImpl implements NxRecycleOrderService {
@Resource
private RecycleOrderMapper recycleOrderMapper;
@Override
public int updateByPrimaryKeySelective(RecycleOrderEntity row) {
return recycleOrderMapper.updateByPrimaryKeySelective(row);
}
}

2
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleOrderServiceImpl.java
Unescape View File

@ -235,7 +235,7 @@ public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, Rec
}
recycleOrderQueryWrapper.lambda().and(t->{
idList.forEach(tt->{
t.like(RecycleOrderEntity::getOrderStafstatusId, tt).or();
t.like(RecycleOrderEntity::getOrderStaffsStatusId, tt).or();
});
});

47
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/NxRecycleOrderController.java
Unescape View File

@ -0,0 +1,47 @@
package jnpf.controller;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jnpf.base.ActionResult;
import jnpf.entity.RecycleOrderEntity;
import jnpf.model.recycleorder.RecycleOrderForm;
import jnpf.service.NxRecycleOrderService;
import jnpf.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid;
/**
* 自定义controller，统一前缀Nx
* 分开编写，便于重新生成时的维护
*/
@Slf4j
@RestController
@Tag(name = "NxRecycleOrder" , description = "scm")
@RequestMapping("/api/scm/NxRecycleOrder")
public class NxRecycleOrderController {
@Resource
private NxRecycleOrderService nxRecycleOrderService;
/**
* 根据id仅更新有值字段
* @param id
* @param recycleOrderEntity
* @return
*/
@PutMapping("/{id}")
@Operation(summary = "根据id仅更新有值字段")
public ActionResult update(@PathVariable("id") String id, @RequestBody RecycleOrderEntity recycleOrderEntity){
recycleOrderEntity.setId(id);
int result = nxRecycleOrderService.updateByPrimaryKeySelective(recycleOrderEntity);
if(result > 0){
return ActionResult.success("更新成功");
}else{
return ActionResult.fail("更新失败，数据不存在");
}
}
}

4
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RecycleOrderEntity.java
Unescape View File

@ -27,8 +27,8 @@ public class RecycleOrderEntity {
private BigDecimal orderAmount;
@TableField(value = "ORDER_CLIENT_STATUS_ID" , updateStrategy = FieldStrategy.IGNORED)
private String orderClientStatusId;
@TableField(value = "ORDER_STAFF_STATUS_ID" , updateStrategy = FieldStrategy.IGNORED)
private String orderStafstatusId;
@TableField(value = "ORDER_STAFFS_STATUS_ID" , updateStrategy = FieldStrategy.IGNORED)
private String orderStaffsStatusId;
@TableField(value = "RECEIVE_PERIOD" , updateStrategy = FieldStrategy.IGNORED)
private Integer receivePeriod;
@TableField(value = "CLIENT_ID" , updateStrategy = FieldStrategy.IGNORED)

4
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycleorder/RecycleOrderConstant.java
View File

File diff suppressed because one or more lines are too long

8
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycleorder/RecycleOrderForm.java
Unescape View File

@ -26,12 +26,12 @@ public class RecycleOrderForm {
/** 订单金额(元) **/
@JsonProperty("orderAmount")
private String orderAmount;
/** 散户端状态 **/
/** 散户状态 **/
@JsonProperty("orderClientStatusId")
private Object orderClientStatusId;
/** 回收员端状态 **/
@JsonProperty("orderStafstatusId")
private Object orderStafstatusId;
/** 回收员状态 **/
@JsonProperty("orderStaffsStatusId")
private Object orderStaffsStatusId;
/** 接单周期(分) **/
@JsonProperty("receivePeriod")
private String receivePeriod;

87
jnpf-java-boot/jnpf-web/src/views/recycleorder/Detail.vue
Unescape View File

@ -46,8 +46,8 @@
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="回收员端状态" prop="orderStafstatusId">
<p>{{dataForm.orderStafstatusId}}</p>
<jnpf-form-tip-item label="回收员端状态" prop="orderStaffsStatusId">
<p>{{dataForm.orderStaffsStatusId}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
@ -236,6 +236,8 @@ import { getConfigData } from '@/api/onlineDev/visualDev'
import jnpf from '@/utils/jnpf'
import Detail from '@/views/basic/dynamicModel/list/detail'
import { thousandsFormat } from "@/components/Generator/utils/index"
import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
export default {
components: { Detail },
props: [],
@ -248,13 +250,21 @@ export default {
paidanDirection: 'rtl',
staffList: [],
zhipanData: {
id: '',
staffsId: "",
staffsName: '',
orderClientStatusId: "",
orderStaffsStatusId: "",
receiveTime: '',
},
dataForm: {
id: '',
orderNumber: '',
orderTypeId: "521999177572425477",
orderAmount: '',
orderClientStatusId: "",
orderStafstatusId: "",
orderStaffsStatusId: "",
receivePeriod: '',
clientId: '',
clientName: '',
@ -282,10 +292,11 @@ export default {
},
orderTypeIdProps: { "label": "fullName", "value": "id" },
orderClientStatusIdProps: { "label": "fullName", "value": "id" },
orderStafstatusIdProps: { "label": "fullName", "value": "id" },
orderStaffsStatusIdProps: { "label": "fullName", "value": "id" },
recycleStationIdProps: { "label": "station_name", "value": "id" },
staffsIdProps: { "label": "staffs_name", "value": "id" },
orderClientStatusIdOptions: [],
orderStaffsStatusIdOptions: [],
}
},
computed: {},
@ -349,6 +360,7 @@ export default {
},
getStaffList() {
this.paidanDrawer = true
this.getorderClientAndStaffsStatusIdOptions();
let _query = {
dataType: 1, //查询全部数据
menuId: this.menuId,
@ -365,30 +377,53 @@ export default {
...o,
...this.expandObj,
}))
console.log(this.staffList);
})
},
getorderClientAndStaffsStatusIdOptions() {
getDictionaryDataSelector('520192751392788805').then(res => {
//console.log(res.data.list);
this.orderClientStatusIdOptions = res.data.list
this.orderStaffsStatusIdOptions = res.data.list
})
},
paidanConfirm() {
console.log('paidan confirm cliked');
// let _data = this.dataForm
// request({
// url: '/api/scm/RecycleOrder/' + this.dataForm.id,
// method: 'PUT',
// data: _data
// }).then((res) => {
// this.$message({
// message: res.msg,
// type: 'success',
// duration: 1000,
// onClose: () => {
// this.detailVisible = true
// this.$emit('refresh', true)
// }
// })
// }).catch(() => {
// // this.btnLoading = false
// // this.continueBtnLoading = false
// })
if (this.dataForm.staffsName) {
console.log('回收员 => ' + this.dataForm.staffsName);
this.zhipanData.id = this.dataForm.id
this.zhipanData.staffsId = this.dataForm.staffsId
this.zhipanData.staffsName = this.dataForm.staffsName
this.zhipanData.orderClientStatusId = '520192868833300805' //待服务
this.zhipanData.orderStaffsStatusId = '520192930493763909' //未到达
this.zhipanData.receiveTime = new Date()
let _data = this.zhipanData
console.log(_data)
// console.log('--------------------');
// console.log(this.orderClientStatusIdOptions);
// console.log(this.orderStaffsStatusIdOptions);
request({
url: '/api/scm/NxRecycleOrder/' + this.dataForm.id,
method: 'PUT',
data: _data
}).then((res) => {
this.$message({
message: res.msg,
type: 'success',
duration: 1000,
onClose: () => {
this.detailVisible = true
this.$emit('refresh', true)
}
})
}).catch(() => {
// this.btnLoading = false
// this.continueBtnLoading = false
})
} else {
// todo
console.log('请至少选择一个回收员');
}
},
},

24
jnpf-java-boot/jnpf-web/src/views/recycleorder/form.vue
Unescape View File

@ -73,11 +73,11 @@
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="回收员端状态" prop="orderStafstatusId">
<JnpfSelect v-model="dataForm.orderStafstatusId"
@change="changeData('orderStafstatusId',-1)" placeholder="请选择" clearable
:style='{"width":"100%"}' :options="orderStafstatusIdOptions"
:props="orderStafstatusIdProps">
<jnpf-form-tip-item label="回收员端状态" prop="orderStaffsStatusId">
<JnpfSelect v-model="dataForm.orderStaffsStatusId"
@change="changeData('orderStaffsStatusId',-1)" placeholder="请选择" clearable
:style='{"width":"100%"}' :options="orderStaffsStatusIdOptions"
:props="orderStaffsStatusIdProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
@ -336,7 +336,7 @@ export default {
orderTypeId: "521999177572425477",
orderAmount: undefined,
orderClientStatusId: undefined,
orderStafstatusId: undefined,
orderStaffsStatusId: undefined,
receivePeriod: undefined,
clientId: undefined,
clientName: undefined,
@ -389,8 +389,8 @@ export default {
orderTypeIdProps: { "label": "fullName", "value": "id" },
orderClientStatusIdOptions: [],
orderClientStatusIdProps: { "label": "fullName", "value": "id" },
orderStafstatusIdOptions: [],
orderStafstatusIdProps: { "label": "fullName", "value": "id" },
orderStaffsStatusIdOptions: [],
orderStaffsStatusIdProps: { "label": "fullName", "value": "id" },
recycleStationIdOptions: [],
recycleStationIdProps: { "label": "station_name", "value": "id" },
staffsIdOptions: [],
@ -402,7 +402,7 @@ export default {
orderTypeId: [],
orderAmount: [],
orderClientStatusId: [],
orderStafstatusId: [],
orderStaffsStatusId: [],
receivePeriod: [],
clientId: [],
clientName: [],
@ -518,7 +518,7 @@ export default {
dataAll() {
this.getorderTypeIdOptions();
this.getorderClientStatusIdOptions();
this.getorderStafstatusIdOptions();
this.getorderStaffsStatusIdOptions();
this.getrecycleStationIdOptions();
this.getstaffsIdOptions();
},
@ -532,9 +532,9 @@ export default {
this.orderClientStatusIdOptions = res.data.list
})
},
getorderStafstatusIdOptions() {
getorderStaffsStatusIdOptions() {
getDictionaryDataSelector('520192751392788805').then(res => {
this.orderStafstatusIdOptions = res.data.list
this.orderStaffsStatusIdOptions = res.data.list
})
},
getrecycleStationIdOptions() {

39
jnpf-java-boot/jnpf-web/src/views/recycleorder/index.vue
Unescape View File

@ -32,8 +32,8 @@
<template v-if="showAll">
<el-col :span="6">
<el-form-item label="回收员端状态">
<JnpfSelect v-model="query.orderStafstatusId" placeholder="请选择" clearable
:options="orderStafstatusIdOptions" :props="orderStafstatusIdProps" multiple>
<JnpfSelect v-model="query.orderStaffsStatusId" placeholder="请选择" clearable
:options="orderStaffsStatusIdOptions" :props="orderStaffsStatusIdProps" multiple>
</JnpfSelect>
</el-form-item>
</el-col>
@ -114,11 +114,11 @@
</el-table-column>
<el-table-column prop="orderTypeId" label="订单类型" align="left">
</el-table-column>
<el-table-column prop="orderAmount" label="订单金额(元)" align="left">
<el-table-column prop="orderAmount" label="金额(元)" align="left">
</el-table-column>
<el-table-column prop="orderClientStatusId" label="散户端状态" align="left">
</el-table-column>
<el-table-column prop="orderStafstatusId" label="回收员端状态" align="left">
<el-table-column prop="orderStaffsStatusId" label="回收员端状态" align="left">
</el-table-column>
<el-table-column prop="receivePeriod" label="接单周期(分)" align="left">
</el-table-column>
@ -126,6 +126,18 @@
</el-table-column>
<el-table-column prop="clientMobile" label="散户手机号" align="left">
</el-table-column>
<el-table-column prop="clientName" label="散户姓名" align="left">
</el-table-column>
<!-- <el-table-column label="回收员" prop="staffsId" algin="left">
<template slot-scope="scope">
{{ scope.row.staffsId}}
</template>
</el-table-column> -->
<el-table-column label="回收员" prop="staffsName" algin="left">
<template slot-scope="scope">
{{ scope.row.staffsName}}
</template>
</el-table-column>
<el-table-column prop="recycleAddress" label="回收地址" align="left">
</el-table-column>
<el-table-column prop="appointmentTimeStart" label="预约时间起" align="left">
@ -148,13 +160,6 @@
</el-table-column>
<el-table-column prop="comment" label="评价详情" align="left">
</el-table-column>
<el-table-column prop="clientName" label="散户姓名" align="left">
</el-table-column>
<el-table-column label="回收员" prop="staffsId" algin="left">
<template slot-scope="scope">
{{ scope.row.staffsId}}
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)">编辑
@ -231,7 +236,7 @@ export default {
orderNumber: undefined,
orderTypeId: undefined,
orderClientStatusId: undefined,
orderStafstatusId: undefined,
orderStaffsStatusId: undefined,
clientMobile: undefined,
recycleStationId: undefined,
appointmentTimeStart: undefined,
@ -265,8 +270,8 @@ export default {
orderTypeIdProps: { "label": "fullName", "value": "id" },
orderClientStatusIdOptions: [],
orderClientStatusIdProps: { "label": "fullName", "value": "id" },
orderStafstatusIdOptions: [],
orderStafstatusIdProps: { "label": "fullName", "value": "id" },
orderStaffsStatusIdOptions: [],
orderStaffsStatusIdProps: { "label": "fullName", "value": "id" },
recycleStationIdOptions: [],
recycleStationIdProps: { "label": "station_name", "value": "id" },
staffsIdOptions: [],
@ -286,7 +291,7 @@ export default {
this.initSearchDataAndListData()
this.getorderTypeIdOptions();
this.getorderClientStatusIdOptions();
this.getorderStafstatusIdOptions();
this.getorderStaffsStatusIdOptions();
this.getrecycleStationIdOptions();
this.queryData = JSON.parse(JSON.stringify(this.query))
},
@ -454,9 +459,9 @@ export default {
this.orderClientStatusIdOptions = res.data.list
})
},
getorderStafstatusIdOptions() {
getorderStaffsStatusIdOptions() {
getDictionaryDataSelector('520192751392788805').then(res => {
this.orderStafstatusIdOptions = res.data.list
this.orderStaffsStatusIdOptions = res.data.list
})
},
getrecycleStationIdOptions() {

Write Preview
Loading…
Cancel
Save