1、添加了评价接口

2、修改了字段属性，更新代码

gly-base-core/build.gradle

@@ -122,6 +122,16 @@ task iasProtocol(type:Jar){
     into('cn/com/taiji/core/model/comm/protocol/ias')
     dependsOn(classes)
 }
+
+task iawProtocol(type:Jar){
+    archiveBaseName='tj'
+    archiveAppendix='iaw-protocol'
+    archiveVersion='1.0.0-SNAPSHOT'
+    archiveExtension='jar'
+    from("build/classes/java/main/cn/com/taiji/core/model/comm/protocol/iaw")
+    into('cn/com/taiji/core/model/comm/protocol/iaw')
+    dependsOn(classes)
+}
 task odsProtocol(type:Jar){
     archiveBaseName='tj'
     archiveAppendix='ods-protocol'
@@ -234,6 +244,13 @@ publishing {
             artifact iasProtocol
             artifact packageCoreSrc
         }
+        myPublicationIawProtocol(MavenPublication) {
+            groupId ="${groupname}"
+            artifactId ='iaw-protocol'
+            version ='1.0.0-SNAPSHOT'
+            artifact iawProtocol
+            artifact packageCoreSrc
+        }
         myPublicationOdsProtocol(MavenPublication) {
             groupId ="${groupname}"
             artifactId ='ods-protocol'

gly-base-core/src/main/java/cn/com/taiji/core/entity/AbstractInsertTimeEntity.java

@@ -0,0 +1,22 @@
+package cn.com.taiji.core.entity;
+
+import javax.persistence.Column;
+import javax.persistence.MappedSuperclass;
+import java.time.LocalDateTime;
+
+
+@MappedSuperclass
+public abstract class AbstractInsertTimeEntity extends AbstractStringPropertyUUIDEntity {
+    private LocalDateTime insertTime = LocalDateTime.now();
+
+    public AbstractInsertTimeEntity() {}
+
+    @Column(name = "insert_time", nullable = false)
+    public LocalDateTime getInsertTime() {
+        return this.insertTime;
+    }
+
+    public void setInsertTime(LocalDateTime insertTime) {
+        this.insertTime = insertTime;
+    }
+}

gly-base-core/src/main/java/cn/com/taiji/core/entity/AbstractUpdateTimeEntity.java

@@ -0,0 +1,30 @@
+package cn.com.taiji.core.entity;
+
+
+import javax.persistence.Column;
+import javax.persistence.MappedSuperclass;
+import java.time.LocalDateTime;
+
+/**
+ * @author pb
+ * @date: 2024/9/29 15:14
+ */
+@MappedSuperclass
+public abstract class AbstractUpdateTimeEntity extends AbstractInsertTimeEntity {
+    private LocalDateTime updateTime = LocalDateTime.now();
+
+    public AbstractUpdateTimeEntity() {
+    }
+
+    @Column(
+            name = "update_time",
+            nullable = false
+    )
+    public LocalDateTime getUpdateTime() {
+        return this.updateTime;
+    }
+
+    public void setUpdateTime(LocalDateTime updateTime) {
+        this.updateTime = updateTime;
+    }
+}

gly-base-core/src/main/java/cn/com/taiji/core/entity/comm/CommonSatisfaction.java

@@ -0,0 +1,231 @@
+package cn.com.taiji.core.entity.comm;
+
+import cn.com.taiji.core.entity.AbstractUpdateTimeEntity;
+import cn.com.taiji.core.entity.dict.issue.OrderSatisfactionType;
+
+import javax.persistence.*;
+import java.math.BigDecimal;
+
+/**
+ * @Auther: humh
+ * @Description:
+ * @Date: 2025/4/14 14:39
+ * @email: huminghao@mail.taiji.com.cn
+ * @version: 1.0
+ */
+@Entity
+@Table(name = "COMMON_SATISFACTION")
+public class CommonSatisfaction extends AbstractUpdateTimeEntity {
+
+    /** 订单编号 */
+    private String orderNo;
+    /** 订单类型 */
+    private OrderSatisfactionType orderType;
+    /** 评价人openid */
+    private String openId;
+    /** 用户姓名 */
+    private String customerName;
+    /** 产品编号 */
+    private String productId;
+    /** 产品名称 */
+    private String productName;
+    /** 是否匿名评价 */
+    private Boolean anonymity = false;
+    /** 业务员ID */
+    private String staffId;
+    /** 业务员姓名 */
+    private String staffName;
+    /** 渠道编号 */
+    private String agencyId;
+    /** 产品分数 1-5 */
+    private BigDecimal productScore;
+    /** 产品评价内容 */
+    private String productMessage;
+    /** 业务员评分 */
+    private BigDecimal staffScore;
+    /** 业务员评价内容 */
+    private String staffMessage;
+    /** 业务办理评分 */
+    private BigDecimal businessScore;
+    /** 业务办理评价内容 */
+    private String businessMessage;
+    /** 图片地址 */
+    private String pictureUrls;
+
+
+    @Column(name = "ORDER_NO")
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    @Enumerated(EnumType.STRING)
+    @Column(name = "ORDER_TYPE")
+    public OrderSatisfactionType getOrderType() {
+        return orderType;
+    }
+
+    public void setOrderType(OrderSatisfactionType orderType) {
+        this.orderType = orderType;
+    }
+
+    @Column(name = "OPEN_ID")
+    public String getOpenId() {
+        return openId;
+    }
+
+    public void setOpenId(String openId) {
+        this.openId = openId;
+    }
+
+    @Column(name = "CUSTOMER_NAME")
+    public String getCustomerName() {
+        return customerName;
+    }
+
+    public void setCustomerName(String customerName) {
+        this.customerName = customerName;
+    }
+
+    @Column(name = "PRODUCT_ID")
+    public String getProductId() {
+        return productId;
+    }
+
+    public void setProductId(String productId) {
+        this.productId = productId;
+    }
+
+    @Column(name = "PRODUCT_NAME")
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    @Column(name = "IS_ANONYMITY")
+    public Boolean getAnonymity() {
+        return anonymity;
+    }
+
+    public void setAnonymity(Boolean anonymity) {
+        this.anonymity = anonymity;
+    }
+
+    @Column(name = "STAFF_ID")
+    public String getStaffId() {
+        return staffId;
+    }
+
+    public void setStaffId(String staffId) {
+        this.staffId = staffId;
+    }
+
+    @Column(name = "STAFF_NAME")
+    public String getStaffName() {
+        return staffName;
+    }
+
+    public void setStaffName(String staffName) {
+        this.staffName = staffName;
+    }
+
+
+    @Column(name = "AGENCY_ID")
+    public String getAgencyId() {
+        return agencyId;
+    }
+
+    public void setAgencyId(String agencyId) {
+        this.agencyId = agencyId;
+    }
+
+
+    @Column(name = "PRODUCT_SCORE")
+    public BigDecimal getProductScore() {
+        return productScore;
+    }
+
+    public void setProductScore(BigDecimal productScore) {
+        if (productScore != null) {
+            // 精确到小数点后一位，使用四舍五入
+            this.productScore = productScore.setScale(1, BigDecimal.ROUND_HALF_UP);
+        } else {
+            this.productScore = null;
+        }
+    }
+
+    @Column(name = "PRODUCT_MESSAGE")
+    public String getProductMessage() {
+        return productMessage;
+    }
+
+    public void setProductMessage(String productMessage) {
+        this.productMessage = productMessage;
+    }
+
+
+    @Column(name = "STAFF_SCORE")
+    public BigDecimal getStaffScore() {
+        return staffScore;
+    }
+
+    public void setStaffScore(BigDecimal staffScore) {
+        if (staffScore != null) {
+            // 精确到小数点后一位，使用四舍五入
+            this.staffScore = staffScore.setScale(1, BigDecimal.ROUND_HALF_UP);
+        } else {
+            this.staffScore = null;
+        }
+    }
+
+
+    @Column(name = "STAFF_MESSAGE")
+    public String getStaffMessage() {
+        return staffMessage;
+    }
+
+    public void setStaffMessage(String staffMessage) {
+        this.staffMessage = staffMessage;
+    }
+
+
+    @Column(name = "BUSINESS_SCORE")
+    public BigDecimal getBusinessScore() {
+        return businessScore;
+    }
+
+    public void setBusinessScore(BigDecimal businessScore) {
+        if (businessScore != null) {
+            // 精确到小数点后一位，使用四舍五入
+            this.businessScore = businessScore.setScale(1, BigDecimal.ROUND_HALF_UP);
+        } else {
+            this.businessScore = null;
+        }
+    }
+
+
+    @Column(name = "BUSINESS_MESSAGE")
+    public String getBusinessMessage() {
+        return businessMessage;
+    }
+
+    public void setBusinessMessage(String businessMessage) {
+        this.businessMessage = businessMessage;
+    }
+
+
+    @Column(name = "PICTURE_URLS")
+    public String getPictureUrls() {
+        return pictureUrls;
+    }
+
+    public void setPictureUrls(String pictureUrls) {
+        this.pictureUrls = pictureUrls;
+    }
+}

gly-base-core/src/main/java/cn/com/taiji/core/entity/dict/issue/OrderSatisfactionType.java

@@ -0,0 +1,16 @@
+package cn.com.taiji.core.entity.dict.issue;
+
+public enum OrderSatisfactionType {
+
+    ISSUE("发行"),
+    ASS("售后"),
+    EQUITY("权益购买"),
+    ;
+
+    private String value;
+
+    OrderSatisfactionType(String value) {
+        this.value = value;
+    }
+
+}

gly-base-core/src/main/java/cn/com/taiji/core/entity/user/Staff.java

@@ -0,0 +1,229 @@
+package cn.com.taiji.core.entity.user;
+
+
+import cn.com.taiji.core.entity.AbstractStringPropertyUUIDEntity;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "QTK_STAFF")
+//@Deprecated //演示用
+public class Staff extends AbstractStringPropertyUUIDEntity {
+
+    /**
+     * 员工工号
+     */
+    private String staffId;
+    /**
+     * 员工姓名
+     */
+    private String staffName;
+    /**
+     * 员工类型（默认为1）
+     */
+    private Integer staffType;
+    /**
+     * （前端）注册日期 yyyyMMdd HH:mm:ss
+     */
+    private String releaseTime;
+    /**
+     * 状态（默认为1）
+     */
+    private Integer status;
+    /**
+     * 新建时间  yyyyMMdd HH:mm:ss
+     */
+    private String createTime;
+    /**
+     * 网点编号
+     */
+    private String serviceHallId;
+    /**
+     * 发行渠道
+     */
+    private String agencyId;
+    /**
+     * 用户账号
+     */
+    private String mobile;
+    /**
+     * 银行账户
+     */
+    private String bankAccount;
+
+    /**网点*/
+//	private QtkServiceHall serviceHall;
+
+    /**
+     * 员工身份标识
+     */
+    private String identityType;
+
+    /**
+     * 员工身份标识
+     * 1：脱敏
+     * 2：不脱敏
+     * 不填值，则默认脱敏
+     */
+    private Integer desensitization;
+
+    private String openId;
+
+
+    @Column(name = "SERVICE_HALL_ID")
+    public String getServiceHallId() {
+        return serviceHallId;
+    }
+
+    @Column(name = "STAFF_ID")
+    public String getStaffId() {
+        return staffId;
+    }
+
+    @Column(name = "STAFF_NAME")
+    public String getStaffName() {
+        return staffName;
+    }
+
+    @Column(name = "STAFF_TYPE")
+    public Integer getStaffType() {
+        return staffType;
+    }
+
+    @Column(name = "RELEASE_TIME")
+    public String getReleaseTime() {
+        return releaseTime;
+    }
+
+    @Column(name = "STATUS")
+    public Integer getStatus() {
+        return status;
+    }
+
+    @Column(name = "CREATE_TIME")
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    @Column(name = "AGENCY_ID")
+    public String getAgencyId() {
+        return agencyId;
+    }
+
+    @Column(name = "MOBILE")
+    public String getMobile() {
+        return mobile;
+    }
+
+    //	@ManyToOne
+//	@JoinColumn(name = "HALL_ID")
+//	public QtkServiceHall getServiceHall() {
+//		return serviceHall;
+//	}
+
+    //	public void setServiceHall(QtkServiceHall serviceHall) {
+//		this.serviceHall =serviceHall;
+//	}
+
+    @Column(name = "BANK_ACCOUNT")
+    public String getBankAccount() {
+        return bankAccount;
+    }
+
+    @Column(name = "IDENTITY_TYPE")
+    public String getIdentityType() {
+        return identityType;
+    }
+
+    @Column(name = "DESENSITIZATION")
+    public Integer getDesensitization() {
+        return desensitization;
+    }
+
+    @Column(name = "OPEN_ID")
+    public String getOpenId() {
+        return openId;
+    }
+
+
+    public void setBankAccount(String bankAccount) {
+        this.bankAccount = bankAccount;
+    }
+
+    public boolean belongTo(Staff staff) {
+        return serviceHallId.startsWith(staff.getServiceHallId());
+    }
+
+    public void setServiceHallId(String serviceHallId) {
+        this.serviceHallId = serviceHallId;
+    }
+
+    public void setStaffId(String staffId) {
+        this.staffId = staffId;
+    }
+
+    public void setStaffName(String staffName) {
+        this.staffName = staffName;
+    }
+
+    public void setStaffType(Integer staffType) {
+        this.staffType = staffType;
+    }
+
+    public void setReleaseTime(String releaseTime) {
+        this.releaseTime = releaseTime;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    public void setAgencyId(String agencyId) {
+        this.agencyId = agencyId;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public void setIdentityType(String identityType) {
+        this.identityType = identityType;
+    }
+
+    public void setDesensitization(Integer desensitization) {
+        this.desensitization = desensitization;
+    }
+
+    public void setOpenId(String openId) {
+        this.openId = openId;
+    }
+
+    public Staff() {
+    }
+
+    public Staff(String staffId, String staffName) {
+        this.staffId = staffId;
+        this.staffName = staffName;
+    }
+
+    public Staff(String staffId, String staffName, String openId) {
+        this.staffId = staffId;
+        this.staffName = staffName;
+        this.openId = openId;
+    }
+
+    public Staff(String staffId, String staffName, String openId, String mobile) {
+        this.staffId = staffId;
+        this.staffName = staffName;
+        this.openId = openId;
+        this.mobile = mobile;
+    }
+
+
+}

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/comm/SatisfactionRepo.java

@@ -0,0 +1,18 @@
+package cn.com.taiji.core.repo.jpa.comm;
+
+
+import cn.com.taiji.common.repo.jpa.AbstractJpaRepo;
+import cn.com.taiji.core.entity.comm.CommonSatisfaction;
+
+/**
+ * @Auther: humh
+ * @Description:
+ * @Date: 2025/4/14 16:26
+ * @email: huminghao@mail.taiji.com.cn
+ * @version: 1.0
+ */
+public interface SatisfactionRepo extends AbstractJpaRepo<CommonSatisfaction, String> {
+
+
+
+}

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/user/StaffRepo.java

@@ -0,0 +1,13 @@
+package cn.com.taiji.core.repo.jpa.user;
+
+import cn.com.taiji.common.repo.jpa.AbstractJpaRepo;
+import cn.com.taiji.core.entity.user.Staff;
+import org.springframework.data.jpa.repository.Query;
+
+
+public interface StaffRepo extends AbstractJpaRepo<Staff, String> {
+
+    @Query("from Staff where openId=?1")
+    Staff findByopenIdTwo(String openId);
+
+}

zhywpt-app-iaw/build.gradle

@@ -9,6 +9,8 @@ dependencies {
     implementation "${groupname}:entity-core:1.0.0-SNAPSHOT"
     implementation "${groupname}:comm-core:1.0.0-SNAPSHOT"
     implementation "${groupname}:sample-protocol:1.0.0-SNAPSHOT"
+    implementation "${groupname}:iaw-protocol:1.0.0-SNAPSHOT"
+    implementation "${groupname}:smp-protocol:1.0.0-SNAPSHOT"
     implementation('cn.com.taiji.common:sso-client:2.3.10.7')
     implementation "org.springframework.boot:spring-boot-starter-security"
     implementation "com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery"

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/api/comm/QtkVehicleBindController.java

@@ -0,0 +1,63 @@
+//package cn.com.taiji.iaw.api.comm;
+//
+//import cn.com.taiji.common.manager.ManagerException;
+//import cn.com.taiji.common.model.dao.Pagination;
+//import cn.com.taiji.common.web.ApiResponse;
+//import cn.com.taiji.iaw.api.MyValidController;
+//import cn.com.taiji.iaw.dto.*;
+//import cn.com.taiji.iaw.manager.comm.QtkVehicleBindManager;
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiOperation;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.web.bind.annotation.PostMapping;
+//import org.springframework.web.bind.annotation.RequestBody;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RestController;
+//
+//import javax.validation.Valid;
+//
+///**
+// * @Auther: humh
+// * @Description:
+// * @Date: 2025/4/15 11:04
+// * @email: huminghao@mail.taiji.com.cn
+// * @version: 1.0
+// */
+//@Api(tags = {"车辆绑定与解绑"})
+//@RestController
+//@RequestMapping("/api/vehicle")
+//public class QtkVehicleBindController extends MyValidController {
+//
+//    @Autowired
+//    private QtkVehicleBindManager manager;
+//
+//    @ApiOperation("车辆绑定列表查询")
+//    @PostMapping("/page")
+//    public ApiResponse<Pagination> page(@Valid @RequestBody VehicleBindPageRequestDTO dto) throws ManagerException {
+//        return ApiResponse.of(manager.page(dto));
+//    }
+//
+//    @ApiOperation(value = "车辆绑定")
+//    @PostMapping(value = "/bind")
+//    public ApiResponse<VehicleBindResponseDTO> bind(@Valid @RequestBody VehicleBindRequestDTO dto) throws ManagerException {
+//        VehicleBindResponseDTO resDto = manager.bind(dto);
+//        return ApiResponse.of(resDto).setMessage("绑定成功");
+//    }
+//
+//
+//    @ApiOperation(value = "车辆解绑")
+//    @PostMapping(value = "/unBind")
+//    public ApiResponse<VehicleUnBindResponseDTO> unBind(@Valid @RequestBody VehicleUnBindRequestDTO dto) throws ManagerException {
+//        VehicleUnBindResponseDTO resDto = manager.unBind(dto);
+//        return ApiResponse.of(resDto).setMessage("解绑成功");
+//    }
+//
+//
+////    @ApiOperation("etc卡信息查询")
+////    @PostMapping("/queryCardInfo")
+////    public ApiResponse<List<CardInfoQueryResponseDTO>> queryCardInfo(@Valid @RequestBody CardInfoQueryRequestDTO dto) throws ManagerException {
+////        return ApiResponse.of(manager.queryCardInfo(dto));
+////    }
+//
+//
+//}

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/api/comm/SatisfactionController.java

@@ -0,0 +1,59 @@
+package cn.com.taiji.iaw.api.comm;
+
+import cn.com.taiji.common.manager.ManagerException;
+import cn.com.taiji.common.model.dao.Pagination;
+import cn.com.taiji.common.web.ApiResponse;
+import cn.com.taiji.iaw.api.MyValidController;
+import cn.com.taiji.iaw.dto.comm.*;
+import cn.com.taiji.iaw.manager.comm.SatisfactionManager;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ * @Auther: humh
+ * @Description: 调查满意度
+ * @Date: 2025/4/14 10:56
+ * @email: huminghao@mail.taiji.com.cn
+ * @version: 1.0
+ */
+
+@Api(tags = {"满意度评价"})
+@RestController
+@RequestMapping("/api/satisfaction")
+public class SatisfactionController extends MyValidController {
+
+    @Autowired
+    private SatisfactionManager manager;
+
+    @ApiOperation("满意度评价列表查询")
+    @PostMapping("/page")
+    public ApiResponse<Pagination> page(@Valid @RequestBody SatisfactionNewPageRequestDTO dto) throws ManagerException {
+        return ApiResponse.of(manager.page(dto));
+    }
+
+    @ApiOperation("满意度评价查询详情")
+    @PostMapping("/view")
+    public ApiResponse<SatisfactionNewInfoResponseDTO> view(@Valid @RequestBody SatisfactionNewInfoRequestDTO dto) throws ManagerException {
+        return ApiResponse.of(manager.view(dto));
+    }
+
+
+    @ApiOperation(value = "满意度评价 - 新增")
+    @PostMapping(value = "/add")
+    public ApiResponse<SatisfactionNewAddResponseDTO> add(@Valid @RequestBody SatisfactionNewAddRequestDTO dto) throws ManagerException {
+        SatisfactionNewAddResponseDTO resDto = manager.add(dto);
+        return ApiResponse.of(resDto).setMessage("添加成功");
+    }
+
+
+
+
+
+}

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/config/AppConfig.java

@@ -26,9 +26,9 @@ import cn.com.taiji.common.repo.jpa.MyJpaRespositoryFactoryBean;
 import cn.com.taiji.iaw.model.MyFinals;
 
 @Configuration
-@EntityScan(value = {"cn.com.taiji." + AppConfig.APP_NAME + ".entity"})
+@EntityScan(value = {"cn.com.taiji." + AppConfig.APP_NAME + ".entity", "cn.com.taiji.core.entity"})
 @EnableJpaRepositories(
-    basePackages = {"cn.com.taiji." + AppConfig.APP_NAME + ".repo.jpa"},
+    basePackages = {"cn.com.taiji." + AppConfig.APP_NAME + ".repo.jpa", "cn.com.taiji.core.repo.jpa"},
     repositoryFactoryBeanClass = MyJpaRespositoryFactoryBean.class)
 @EnableTransactionManagement(mode = AdviceMode.ASPECTJ, proxyTargetClass = true)
 @ComponentScan(value = "cn.com.taiji.core.manager.comm.client.feign")

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/AbstractBizPageRequestDTO.java

@@ -0,0 +1,15 @@
+package cn.com.taiji.iaw.dto;
+
+import cn.com.taiji.common.model.finals.SysFinals;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public abstract class AbstractBizPageRequestDTO extends AbstractBizRequestDTO {
+
+    private Integer pageNo = SysFinals.DEFAULT_PAGE_NUM;
+
+    private Integer pageSize = SysFinals.DEFAULT_PAGE_SIZE;
+
+}

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/AbstractBizRequestDTO.java

@@ -0,0 +1,50 @@
+package cn.com.taiji.iaw.dto;
+
+import cn.com.taiji.common.valid.BaseValidDTO;
+import cn.com.taiji.common.valid.ViolationValidator;
+import cn.com.taiji.core.entity.dict.basic.SourceType;
+import cn.com.taiji.core.model.comm.protocol.constraint.FixedLength;
+import cn.com.taiji.core.model.comm.protocol.constraint.IntegerConstant;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+import org.springframework.validation.annotation.Validated;
+
+import javax.validation.constraints.NotBlank;
+
+@Setter
+@Getter
+@Accessors(chain = true)
+@Validated
+public abstract class AbstractBizRequestDTO extends BaseValidDTO {
+    // 前端公参
+    @NotBlank(message = "openId不能为空")
+    private String openId;
+    @NotBlank(message = "loginSource不能为空")
+    private String loginSource;
+    @NotBlank(message = "agentId不能为空")
+    @FixedLength(length = 11)
+    private String agentId;
+    @NotBlank(message = "channelId不能为空")
+//    @FixedLength(length = 19)
+    private String channelId;
+    @IntegerConstant(values = "1,2", message = "网点类型错误！线下网点填写2")
+    private Integer channelType;
+    private String staffId;
+    private String terminalId;
+
+    private String orgCode;
+
+
+    public SourceType getOrderSource() {
+        return SourceType.findByCode(loginSource);
+    }
+
+    @Override
+    protected void validate(ViolationValidator validator) {
+        if (getOrderSource() == SourceType.SERVICE_HALL) {
+            validator.validFieldNotBlank("staffId", staffId);
+        }
+    }
+
+}

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/comm/SatisfactionNewAddRequestDTO.java

@@ -0,0 +1,73 @@
+package cn.com.taiji.iaw.dto.comm;
+
+import cn.com.taiji.common.valid.ViolationValidator;
+import cn.com.taiji.core.entity.dict.issue.OrderSatisfactionType;
+import cn.com.taiji.iaw.dto.AbstractBizRequestDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+/**
+ * @Auther: humh
+ * @Description:
+ * @Date: 2025/4/14 14:58
+ * @email: huminghao@mail.taiji.com.cn
+ * @version: 1.0
+ */
+@ApiModel(description = "满意度评价添加请求")
+@Getter
+@Setter
+@Accessors(chain = true)
+public class SatisfactionNewAddRequestDTO extends AbstractBizRequestDTO {
+    @ApiModelProperty(value = "订单类型")
+    @NotNull
+    private OrderSatisfactionType orderType;
+    @ApiModelProperty(value = "订单编号")
+    @NotBlank
+    private String orderNo;
+    @ApiModelProperty(value = "用户姓名")
+    @NotBlank
+    private String customerName;
+    @ApiModelProperty(value = "产品编号")
+    private String productId;
+    @ApiModelProperty(value = "产品名称")
+    private String productName;
+    @ApiModelProperty(value = "是否匿名评价 true/false")
+    @NotNull
+    private Boolean anonymity = false;
+    @ApiModelProperty(value = "业务员姓名")
+    private String staffName;
+    @ApiModelProperty(value = "渠道编号")
+    private String agencyId;
+    @ApiModelProperty(value = "产品分数")
+    private BigDecimal productScore;
+    @ApiModelProperty(value = "产品评价内容")
+    private String productMessage;
+    @ApiModelProperty(value = "业务员评分")
+    private BigDecimal staffScore;
+    @ApiModelProperty(value = "业务员评价内容")
+    private String staffMessage;
+    @ApiModelProperty(value = "业务办理评分")
+    @NotNull
+    private BigDecimal businessScore;
+    @ApiModelProperty(value = "业务办理评价内容")
+    private String businessMessage;
+    @ApiModelProperty(value = "图片路径")
+    private String pictureUrls;//添加模板需要文件字段接收
+
+    @Override
+    protected void validate(ViolationValidator validator) {
+
+    }
+
+
+
+
+
+}

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/comm/SatisfactionNewAddResponseDTO.java

@@ -0,0 +1,24 @@
+package cn.com.taiji.iaw.dto.comm;
+
+import cn.com.taiji.common.model.BaseModel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+/**
+ * @Auther: humh
+ * @Description:
+ * @Date: 2025/4/14 19:45
+ * @email: huminghao@mail.taiji.com.cn
+ * @version: 1.0
+ */
+@ApiModel(description = "满意度评价新增响应")
+@Getter
+@Setter
+@Accessors(chain = true)
+public class SatisfactionNewAddResponseDTO extends BaseModel {
+    @ApiModelProperty(value = "满意度评价id")
+    private String id;
+}

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/comm/SatisfactionNewInfoRequestDTO.java

@@ -0,0 +1,34 @@
+package cn.com.taiji.iaw.dto.comm;
+
+import cn.com.taiji.common.valid.ViolationValidator;
+import cn.com.taiji.iaw.dto.AbstractBizRequestDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Auther: humh
+ * @Description:
+ * @Date: 2025/4/14 14:58
+ * @email: huminghao@mail.taiji.com.cn
+ * @version: 1.0
+ */
+@ApiModel(description = "满意度评价详情查询请求")
+@Getter
+@Setter
+@Accessors(chain = true)
+public class SatisfactionNewInfoRequestDTO extends AbstractBizRequestDTO {
+
+    @ApiModelProperty(value = "id",required = false)
+    @NotBlank(message = "id不能为空")
+    private String id;
+
+    @Override
+    protected void validate(ViolationValidator validator) {
+
+    }
+}

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/comm/SatisfactionNewInfoResponseDTO.java

@@ -0,0 +1,90 @@
+package cn.com.taiji.iaw.dto.comm;
+
+import cn.com.taiji.core.entity.dict.issue.OrderSatisfactionType;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+
+/**
+ * @Auther: humh
+ * @Description:
+ * @Date: 2025/4/14 19:40
+ * @email: huminghao@mail.taiji.com.cn
+ * @version: 1.0
+ */
+@ApiModel(description = "满意度评价查询详情")
+@Setter
+@Getter
+@Accessors(chain = true)
+public class SatisfactionNewInfoResponseDTO {
+    @ApiModelProperty(value = "订单类型")
+    private OrderSatisfactionType orderType;
+    @ApiModelProperty(value = "订单编号")
+    private String orderNo;
+    @ApiModelProperty(value = "评价人openid")
+    private String openId;
+    @ApiModelProperty(value = "用户姓名")
+    private String customerName;
+    @ApiModelProperty(value = "产品编号")
+    private String productId;
+    @ApiModelProperty(value = "产品名称")
+    private String productName;
+    @ApiModelProperty(value = "是否匿名评价 true/false")
+    private Boolean anonymity = false;
+    @ApiModelProperty(value = "业务员ID")
+    private String staffId;
+    @ApiModelProperty(value = "业务员姓名")
+    private String staffName;
+    @ApiModelProperty(value = "渠道编号")
+    private String agencyId;
+    @ApiModelProperty(value = "产品分数")
+    private BigDecimal productScore;
+    @ApiModelProperty(value = "产品评价内容")
+    private String productMessage;
+    @ApiModelProperty(value = "业务员评分")
+    private BigDecimal staffScore;
+    @ApiModelProperty(value = "业务员评价内容")
+    private String staffMessage;
+    @ApiModelProperty(value = "业务办理评分")
+    private BigDecimal businessScore;
+    @ApiModelProperty(value = "业务办理评价内容")
+    private String businessMessage;
+    @ApiModelProperty(value = "图片路径")
+    private String pictureUrls;//添加模板需要文件字段接收
+
+
+    // 自定义 setter 方法，覆盖 Lombok 自动生成的 setter
+    public void setProductScore(BigDecimal productScore) {
+        if (productScore != null) {
+            // 精确到小数点后一位，使用四舍五入
+            this.productScore = productScore.setScale(1, BigDecimal.ROUND_HALF_UP);
+        } else {
+            this.productScore = null;
+        }
+    }
+
+    public void setStaffScore(BigDecimal staffScore) {
+        if (staffScore != null) {
+            // 精确到小数点后一位，使用四舍五入
+            this.staffScore = staffScore.setScale(1, BigDecimal.ROUND_HALF_UP);
+        } else {
+            this.staffScore = null;
+        }
+    }
+
+    public void setBusinessScore(BigDecimal businessScore) {
+        if (businessScore != null) {
+            // 精确到小数点后一位，使用四舍五入
+            this.businessScore = businessScore.setScale(1, BigDecimal.ROUND_HALF_UP);
+        } else {
+            this.businessScore = null;
+        }
+    }
+
+
+
+}

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/comm/SatisfactionNewPageRequestDTO.java

@@ -0,0 +1,34 @@
+package cn.com.taiji.iaw.dto.comm;
+
+import cn.com.taiji.core.entity.dict.issue.OrderSatisfactionType;
+import cn.com.taiji.iaw.dto.AbstractBizRequestDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * @Auther: humh
+ * @Description:
+ * @Date: 2025/4/14 14:58
+ * @email: huminghao@mail.taiji.com.cn
+ * @version: 1.0
+ */
+@ApiModel(description = "满意度评价查询请求")
+@Getter
+@Setter
+@Accessors(chain = true)
+public class SatisfactionNewPageRequestDTO extends AbstractBizRequestDTO {
+    @ApiModelProperty(value = "业务类型",required = false)
+    private OrderSatisfactionType orderType;
+    @ApiModelProperty(value = "评价人",required = false)
+    private String customerName;
+    @ApiModelProperty(value = "评价时间开始",required = false)
+    private LocalDateTime appraiseTimeKs;
+    @ApiModelProperty(value = "评价时间结束",required = false)
+    private LocalDateTime appraiseTimeJs;
+
+}

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/comm/VehicleBindPageRequestDTO.java

@@ -0,0 +1,28 @@
+package cn.com.taiji.iaw.dto.comm;
+
+import cn.com.taiji.iaw.dto.AbstractBizRequestDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+/**
+ * @Auther: humh
+ * @Description:
+ * @Date: 2025/4/15 15:37
+ * @email: huminghao@mail.taiji.com.cn
+ * @version: 1.0
+ */
+@ApiModel(description = "车辆绑定数据查询请求")
+@Getter
+@Setter
+@Accessors(chain = true)
+public class VehicleBindPageRequestDTO extends AbstractBizRequestDTO {
+
+    @ApiModelProperty(value = "车牌号")
+    private String vehiclePlate;
+    @ApiModelProperty(value = "车牌颜色")
+    private Integer vehiclePlateColor;
+
+}

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/comm/VehicleBindRequestDTO.java

@@ -0,0 +1,46 @@
+package cn.com.taiji.iaw.dto.comm;
+
+import cn.com.taiji.iaw.dto.AbstractBizRequestDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Auther: humh
+ * @Description:
+ * @Date: 2025/4/15 11:05
+ * @email: huminghao@mail.taiji.com.cn
+ * @version: 1.0
+ */
+@ApiModel(description = "车辆绑定请求")
+@Getter
+@Setter
+@Accessors(chain = true)
+public class VehicleBindRequestDTO extends AbstractBizRequestDTO {
+
+    @ApiModelProperty(value = "车牌号")
+    @NotBlank
+    private String vehiclePlate;
+    @ApiModelProperty(value = "车牌颜色")
+    @NotBlank
+    private String vehiclePlateColor;
+    @ApiModelProperty(value = "实际操作人openId，他人激活或者业务员激活时此字段和account_id不一致")
+    @NotBlank
+    private String operaterId;
+    @ApiModelProperty(value = "etc卡号")
+    @NotBlank
+    private String cardId;
+    @ApiModelProperty(value = "卡类型1-记账卡 2-储值卡 3-预存卡 ")
+    @NotNull
+    private Integer cardType;
+    @ApiModelProperty(value = "卡状态")
+    @NotNull
+    private Integer cardStatus;
+
+
+}

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/comm/VehicleBindResponseDTO.java

@@ -0,0 +1,26 @@
+package cn.com.taiji.iaw.dto.comm;
+
+import cn.com.taiji.common.model.BaseModel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+/**
+ * @Auther: humh
+ * @Description:
+ * @Date: 2025/4/15 11:11
+ * @email: huminghao@mail.taiji.com.cn
+ * @version: 1.0
+ */
+@ApiModel(description = "车辆绑定响应")
+@Getter
+@Setter
+@Accessors(chain = true)
+public class VehicleBindResponseDTO extends BaseModel {
+
+    @ApiModelProperty(value = "车辆绑定数据id")
+    private String id;
+
+}

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/comm/VehicleUnBindRequestDTO.java

@@ -0,0 +1,29 @@
+package cn.com.taiji.iaw.dto.comm;
+
+import cn.com.taiji.iaw.dto.AbstractBizRequestDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Auther: humh
+ * @Description:
+ * @Date: 2025/4/15 15:24
+ * @email: huminghao@mail.taiji.com.cn
+ * @version: 1.0
+ */
+@ApiModel(description = "车辆解绑请求")
+@Getter
+@Setter
+@Accessors(chain = true)
+public class VehicleUnBindRequestDTO extends AbstractBizRequestDTO {
+
+    @ApiModelProperty(value = "车辆解绑数据id")
+    @NotBlank
+    private String id;
+
+}

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/comm/VehicleUnBindResponseDTO.java

@@ -0,0 +1,25 @@
+package cn.com.taiji.iaw.dto.comm;
+
+import cn.com.taiji.common.model.BaseModel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+/**
+ * @Auther: humh
+ * @Description:
+ * @Date: 2025/4/15 11:11
+ * @email: huminghao@mail.taiji.com.cn
+ * @version: 1.0
+ */
+@ApiModel(description = "车辆解绑响应")
+@Getter
+@Setter
+@Accessors(chain = true)
+public class VehicleUnBindResponseDTO extends BaseModel {
+
+    @ApiModelProperty(value = "车辆解绑数据id")
+    private String id;
+}

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/comm/QtkVehicleBindManager.java

@@ -0,0 +1,23 @@
+//package cn.com.taiji.iaw.manager.comm;
+//
+//import cn.com.taiji.common.manager.ManagerException;
+//import cn.com.taiji.common.model.dao.Pagination;
+//import cn.com.taiji.iaw.dto.*;
+//
+///**
+// * @Auther: humh
+// * @Description:
+// * @Date: 2025/4/15 11:25
+// * @email: huminghao@mail.taiji.com.cn
+// * @version: 1.0
+// */
+//public interface QtkVehicleBindManager {
+//
+//    VehicleBindResponseDTO bind(VehicleBindRequestDTO dto) throws ManagerException;
+//
+//    VehicleUnBindResponseDTO unBind(VehicleUnBindRequestDTO dto) throws ManagerException;
+//
+//    Pagination page(VehicleBindPageRequestDTO dto);
+//
+//    List<CardInfoQueryResponseDTO> queryCardInfo(CardInfoQueryRequestDTO dto) throws ManagerException;
+//}

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/comm/QtkVehicleBindManagerImpl.java

@@ -0,0 +1,104 @@
+//package cn.com.taiji.iaw.manager.comm;
+//
+//import cn.com.taiji.common.manager.ManagerException;
+//import cn.com.taiji.common.model.dao.Pagination;
+//import cn.com.taiji.common.pub.BeanTools;
+//import cn.com.taiji.common.pub.CollectionTools;
+//import cn.com.taiji.core.entity.basic.QtkCardInfo;
+//import cn.com.taiji.core.repo.jpa.basic.QtkCardInfoRepo;
+//import cn.com.taiji.iaw.dto.*;
+//import org.apache.commons.lang3.StringUtils;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.Service;
+//
+//import java.time.LocalDateTime;
+//import java.util.ArrayList;
+//import java.util.List;
+//import java.util.stream.Collectors;
+//
+///**
+// * @Auther: humh
+// * @Description:
+// * @Date: 2025/4/15 11:25
+// * @email: huminghao@mail.taiji.com.cn
+// * @version: 1.0
+// */
+//@Service
+//public class QtkVehicleBindManagerImpl implements QtkVehicleBindManager{
+//
+//    @Autowired
+//    private QtkVehicleBindRepo repo;
+//    @Autowired
+//    private WxLoginUserUtil wxLoginUserUtil;
+//    @Autowired
+//    private QtkCardInfoRepo cardInfoRepo;
+//
+//    @Override
+//    public VehicleBindResponseDTO bind(VehicleBindRequestDTO dto) throws ManagerException {
+//        VehicleBindResponseDTO resDto = new VehicleBindResponseDTO();
+//        if (!StringUtils.isEmpty(dto.getOpenId())){
+//            String customerId = wxLoginUserUtil.getCustomerIdFromOpenId(dto.getOpenId());
+//            if (StringUtils.isEmpty(customerId)){
+//                throw new ManagerException("车辆不是操作人名下的卡签关联车辆，无法绑定！");
+//            }
+//            List<QtkCardInfo> cardInfos = cardInfoRepo.listByCustomerInfo(customerId);
+//            if (CollectionTools.isEmpty(cardInfos)){
+//                throw new ManagerException("车辆不是操作人名下的卡签关联车辆，无法绑定！");
+//            }
+//            if (!cardInfos.stream().map(QtkCardInfo::getCardId).collect(Collectors.toList()).contains(dto.getCardId())){
+//                throw new ManagerException("该车辆的ETC卡号校验失败，无法绑定！");
+//            }
+//            QtkVehicleBind vehicleBind = new QtkVehicleBind();
+//            BeanTools.copyProperties(dto, vehicleBind,"id");
+//            vehicleBind.setVehicleId(dto.getVehiclePlate() + "_" + dto.getVehiclePlateColor());
+//            vehicleBind.setBindStatus(1);//默认1，1-绑定 2-解除
+//            vehicleBind.setBindTime(LocalDateTime.now());
+//            vehicleBind.setAutoBind(false);
+//            repo.save(vehicleBind);
+//            resDto.setId(vehicleBind.getId());
+//        }
+//        return resDto;
+//    }
+//
+//    @Override
+//    public VehicleUnBindResponseDTO unBind(VehicleUnBindRequestDTO dto) throws ManagerException {
+//        QtkVehicleBind vehicleBind = repo.findById(dto.getId()).orElse(null);
+//        if (vehicleBind == null){
+//            throw new ManagerException("未查询到车辆信息，请刷新重试！");
+//        }
+//        vehicleBind.setBindStatus(2);//1-绑定 2-解除
+//        vehicleBind.setUnbindTime(LocalDateTime.now());
+//        repo.save(vehicleBind);
+//        VehicleUnBindResponseDTO resDto = new VehicleUnBindResponseDTO();
+//        resDto.setId(dto.getId());
+//        return resDto;
+//    }
+//
+//    @Override
+//    public Pagination page(VehicleBindPageRequestDTO dto) {
+//        VehicleBindPageRequest pageRequest = new VehicleBindPageRequest();
+//        BeanTools.copyProperties(dto, pageRequest);
+//        // 判断入口路径，微信端只查自己的openId
+//        return repo.page(pageRequest);
+//    }
+//
+//    @Override
+//    public List<CardInfoQueryResponseDTO> queryCardInfo(CardInfoQueryRequestDTO dto) throws ManagerException {
+//        String customerId = wxLoginUserUtil.getCustomerIdFromOpenId(dto.getOpenId());
+//        if (StringUtils.isEmpty(customerId)){
+//            throw new ManagerException("未获取到用户信息！");
+//        }
+//        List<QtkCardInfo> cardInfos = cardInfoRepo.listByCustomerIdAndVehicleId(customerId, dto.getVehiclePlate() + "_" + dto.getVehiclePlateColor());
+//        List<CardInfoQueryResponseDTO> list = new ArrayList<>();
+//        for (QtkCardInfo cardInfo : cardInfos) {
+//            CardInfoQueryResponseDTO resDTo = new CardInfoQueryResponseDTO();
+//            resDTo.setCardId(cardInfo.getCardId());
+//            resDTo.setCardType(cardInfo.getCardType());
+//            resDTo.setCardStatus(cardInfo.getCardStatus());
+//            list.add(resDTo);
+//        }
+//        return list;
+//    }
+//
+//
+//}

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/comm/SatisfactionManager.java

@@ -0,0 +1,21 @@
+package cn.com.taiji.iaw.manager.comm;
+
+import cn.com.taiji.common.manager.ManagerException;
+import cn.com.taiji.common.model.dao.Pagination;
+import cn.com.taiji.iaw.dto.comm.*;
+
+/**
+ * @Auther: humh
+ * @Description:
+ * @Date: 2025/4/14 15:55
+ * @email: huminghao@mail.taiji.com.cn
+ * @version: 1.0
+ */
+public interface SatisfactionManager {
+
+    Pagination page(SatisfactionNewPageRequestDTO dto);
+
+    SatisfactionNewInfoResponseDTO view(SatisfactionNewInfoRequestDTO dto) throws ManagerException;
+
+    SatisfactionNewAddResponseDTO add(SatisfactionNewAddRequestDTO dto) throws ManagerException;
+}

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/comm/SatisfactionManagerImpl.java

@@ -0,0 +1,73 @@
+package cn.com.taiji.iaw.manager.comm;
+
+import cn.com.taiji.common.manager.ManagerException;
+import cn.com.taiji.common.model.dao.Pagination;
+import cn.com.taiji.common.pub.BeanTools;
+import cn.com.taiji.core.entity.comm.CommonSatisfaction;
+import cn.com.taiji.core.entity.dict.basic.SourceType;
+import cn.com.taiji.core.entity.user.Staff;
+import cn.com.taiji.core.repo.jpa.comm.SatisfactionRepo;
+import cn.com.taiji.core.repo.jpa.user.StaffRepo;
+import cn.com.taiji.iaw.dto.comm.*;
+import cn.com.taiji.iaw.manager.AbstractCommManager;
+import cn.com.taiji.iaw.repo.jpa.request.comm.SatisfactionNewPageRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+
+/**
+ * @Auther: humh
+ * @Description:
+ * @Date: 2025/4/14 15:55
+ * @email: huminghao@mail.taiji.com.cn
+ * @version: 1.0
+ */
+@Service
+public class SatisfactionManagerImpl extends AbstractCommManager implements SatisfactionManager{
+
+    @Autowired
+    private SatisfactionRepo repo;
+    @Autowired
+    private StaffRepo staffRepo;
+
+    @Override
+    public Pagination page(SatisfactionNewPageRequestDTO reqDto) {
+
+        SatisfactionNewPageRequest pageRequest = new SatisfactionNewPageRequest();
+        BeanTools.copyProperties(reqDto, pageRequest);
+        if (SourceType.WEB.equals(reqDto.getOrderSource()) || SourceType.SERVICE_HALL.equals(reqDto.getOrderSource())){
+            // 判断入口路径，微信端只查自己的openId
+            Staff staff = staffRepo.findByopenIdTwo(reqDto.getOpenId());
+            if (staff != null){
+                pageRequest.setAgencyId(staff.getAgencyId());
+                if ("SUPER_MANAGER".equals(staff.getIdentityType())){
+                    pageRequest.setAgencyId(null);
+                }
+            }
+        }
+        return repo.page(pageRequest);
+    }
+
+    @Override
+    public SatisfactionNewInfoResponseDTO view(SatisfactionNewInfoRequestDTO dto) throws ManagerException {
+        CommonSatisfaction satisfactionNew = repo.findById(dto.getId()).orElse(null);
+        if (satisfactionNew == null){
+            throw new ManagerException("未查询到满意度评价信息");
+        }
+        SatisfactionNewInfoResponseDTO infoResponseDTO = new SatisfactionNewInfoResponseDTO();
+        BeanTools.copyProperties(satisfactionNew, infoResponseDTO);
+        return infoResponseDTO;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public SatisfactionNewAddResponseDTO add(SatisfactionNewAddRequestDTO dto) throws ManagerException {
+        CommonSatisfaction satisfaction = new CommonSatisfaction();
+        BeanTools.copyProperties(dto, satisfaction,"id");
+        repo.save(satisfaction);
+        SatisfactionNewAddResponseDTO addResponseDTO = new SatisfactionNewAddResponseDTO();
+        addResponseDTO.setId(satisfaction.getId());
+        return addResponseDTO;
+    }
+}

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/repo/jpa/request/comm/SatisfactionNewPageRequest.java

@@ -0,0 +1,49 @@
+package cn.com.taiji.iaw.repo.jpa.request.comm;
+
+import cn.com.taiji.common.pub.dao.HqlBuilder;
+import cn.com.taiji.common.repo.request.jpa.JpaPageableDataRequest;
+import cn.com.taiji.core.entity.comm.CommonSatisfaction;
+import cn.com.taiji.core.entity.dict.issue.OrderSatisfactionType;
+import io.swagger.annotations.ApiModel;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * @Auther: humh
+ * @Description:
+ * @Date: 2025/4/14 16:17
+ * @email: huminghao@mail.taiji.com.cn
+ * @version: 1.0
+ */
+@ApiModel(description = "满意度评价分页查询")
+@Getter
+@Setter
+@Accessors(chain = true)
+public class SatisfactionNewPageRequest extends JpaPageableDataRequest<CommonSatisfaction> {
+    /** 业务类型 */
+    private OrderSatisfactionType orderType;
+    /** 评价人 */
+    private String customerName;
+    /** 评价时间开始 */
+    private LocalDateTime appraiseTimeKs;
+    /** 评价时间结束 */
+    private LocalDateTime appraiseTimeJs;
+    /** 渠道编号 */
+    private String agencyId;
+
+
+    @Override
+    public HqlBuilder toSelectHql() {
+        HqlBuilder hql = new HqlBuilder("from " + CommonSatisfaction.class.getName() + " where 1=1 ");
+        hql.append(" and orderType = :orderType ", orderType);
+        hql.append(" and customerName like :customerName ", like(customerName));
+        hql.append(" and insertTime >= :appraiseTimeKs ", appraiseTimeKs);
+        hql.append(" and insertTime <= :appraiseTimeJs ", appraiseTimeJs);
+        hql.append(" and agencyId = :agencyId ", agencyId);
+        hql.append(" order by insertTime desc ");
+        return hql;
+    }
+}

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/repo/jpa/request/comm/VehicleBindPageRequest.java

@@ -0,0 +1,41 @@
+//package cn.com.taiji.iaw.repo.jpa.request.comm;
+//
+//import cn.com.taiji.common.pub.dao.HqlBuilder;
+//import io.swagger.annotations.ApiModel;
+//import lombok.Getter;
+//import lombok.Setter;
+//import lombok.experimental.Accessors;
+//
+///**
+// * @Auther: humh
+// * @Description:
+// * @Date: 2025/4/16 20:39
+// * @email: huminghao@mail.taiji.com.cn
+// * @version: 1.0
+// */
+//@ApiModel(description = "车辆绑定与解绑分页查询")
+//@Getter
+//@Setter
+//@Accessors(chain = true)
+//public class VehicleBindPageRequest extends JpaPageableDataRequest<QtkVehicleBind> {
+//
+//    /** 绑定状态 */
+//    private Integer bindStatus = 1;
+//    /** openId */
+//    private String openId;
+//    /** 车牌号 */
+//    private String vehiclePlate;
+//    /** 车牌号 */
+//    private Integer vehiclePlateColor;
+//
+//    @Override
+//    public HqlBuilder toSelectHql() {
+//        HqlBuilder hql = new HqlBuilder("from " + QtkVehicleBind.class.getName() + " where 1=1 ");
+//        hql.append(" and bindStatus = :bindStatus ", bindStatus);
+//        hql.append(" and openId = :openId ", openId);
+//        hql.append(" and vehiclePlate = :vehiclePlate ", vehiclePlate);
+//        hql.append(" and vehiclePlateColor = :vehiclePlateColor ", vehiclePlateColor);
+//        hql.append(" order by bindTime desc ");
+//        return hql;
+//    }
+//}

zhywpt-app-iaw/src/main/resources/bootstrap.yml

@@ -14,16 +14,16 @@ spring:
       discovery:
         enabled: true
         server-addr: 100.64.2.105:8848
-        namespace: guizhou-issuer
+        namespace: zhywpt-new-test
         username: nacos
         password: '!@#$%qwertASDFG'
-        ip: 127.0.0.1
+#        ip: 127.0.0.1
       #        networkInterface: 以太网
       config:
         enabled: true
         file-extension: yaml  # 必须修改成yaml
         server-addr: 100.64.2.105:8848
-        namespace: guizhou-issuer
+        namespace: zhywpt-new-test
         username: nacos
         password: '!@#$%qwertASDFG'
         extension-configs:

zhywpt-app-iaw/src/test/java/cn/com/taiji/iaw/manager/TestSampleRepo.java

@@ -1,48 +1,48 @@
-package cn.com.taiji.iaw.manager;
-
-import cn.com.taiji.common.manager.AbstractManager;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-
-import cn.com.taiji.iaw.entity.Sample;
-import cn.com.taiji.iaw.repo.jpa.SampleRepo;
-import cn.com.taiji.iaw.repo.jpa.request.SamplePageRequest1;
-import cn.com.taiji.iaw.repo.jpa.request.SamplePageRequest2;
-
-@SpringBootTest
-public class TestSampleRepo extends AbstractManager {
-
-    @Autowired
-    private SampleRepo repo;
-
-    @org.junit.jupiter.api.Test
-    public void testRepo() {
-        Sample sample = new Sample();
-        sample.setName("张三");
-        sample.setIdNum("123456789");
-        sample.setIntValue(1);
-        sample.setAddress("贵州");
-        System.out.println("*****************-2" + sample);
-        repo.persist(sample);
-        System.out.println("*****************-1" + sample);
-        System.out.println("******************0" + repo.findById(sample.getId()).orElse(null));
-        System.out.println("******************0" + sample);
-        System.out.println("******************1" + repo.listByName("张三"));// 正确
-        System.out.println("******************2" + repo.listByNameSql("张三"));// 使用原生sql(nativeQuery)查不出来
-        System.out.println("******************3" + repo.listByName("张三-encrypt"));// 查不出来
-        System.out.println("******************4" + repo.listByNameSql("张三-encrypt"));// 能查出来，不建议用，结果明文
-        System.out.println("******************5" + repo.listPropertyByName("张三"));// 正确
-        System.out.println("******************6" + repo.page(new SamplePageRequest1("张三")).getResult());
-        System.out.println(
-            "******************6" + repo.page(new SamplePageRequest2("张三")).getResult(Object[].class).get(0)[0]);
-        repo.updateName("张三2", "张三");
-        System.out.println("*****************11" + sample);
-        Sample newSample = repo.findById(sample.getId()).orElse(null);
-        System.out.println("*****************12" + newSample);
-        newSample.setName("张三3");
-        repo.merge(newSample);
-        System.out.println("*****************13" +  repo.findById(sample.getId()).orElse(null));
-
-    }
-
-}
+//package cn.com.taiji.iaw.manager;
+//
+//import cn.com.taiji.common.manager.AbstractManager;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.test.context.SpringBootTest;
+//
+//import cn.com.taiji.iaw.entity.Sample;
+//import cn.com.taiji.iaw.repo.jpa.SampleRepo;
+//import cn.com.taiji.iaw.repo.jpa.request.SamplePageRequest1;
+//import cn.com.taiji.iaw.repo.jpa.request.SamplePageRequest2;
+//
+//@SpringBootTest
+//public class TestSampleRepo extends AbstractManager {
+//
+//    @Autowired
+//    private SampleRepo repo;
+//
+//    @org.junit.jupiter.api.Test
+//    public void testRepo() {
+//        Sample sample = new Sample();
+//        sample.setName("张三");
+//        sample.setIdNum("123456789");
+//        sample.setIntValue(1);
+//        sample.setAddress("贵州");
+//        System.out.println("*****************-2" + sample);
+//        repo.persist(sample);
+//        System.out.println("*****************-1" + sample);
+//        System.out.println("******************0" + repo.findById(sample.getId()).orElse(null));
+//        System.out.println("******************0" + sample);
+//        System.out.println("******************1" + repo.listByName("张三"));// 正确
+//        System.out.println("******************2" + repo.listByNameSql("张三"));// 使用原生sql(nativeQuery)查不出来
+//        System.out.println("******************3" + repo.listByName("张三-encrypt"));// 查不出来
+//        System.out.println("******************4" + repo.listByNameSql("张三-encrypt"));// 能查出来，不建议用，结果明文
+//        System.out.println("******************5" + repo.listPropertyByName("张三"));// 正确
+//        System.out.println("******************6" + repo.page(new SamplePageRequest1("张三")).getResult());
+//        System.out.println(
+//            "******************6" + repo.page(new SamplePageRequest2("张三")).getResult(Object[].class).get(0)[0]);
+//        repo.updateName("张三2", "张三");
+//        System.out.println("*****************11" + sample);
+//        Sample newSample = repo.findById(sample.getId()).orElse(null);
+//        System.out.println("*****************12" + newSample);
+//        newSample.setName("张三3");
+//        repo.merge(newSample);
+//        System.out.println("*****************13" +  repo.findById(sample.getId()).orElse(null));
+//
+//    }
+//
+//}

zhywpt-service-ats/src/test/java/cn/com/taiji/ats/manager/wx/TestWxMpIsSubscribedManager.java

@@ -1,5 +1,10 @@
 package cn.com.taiji.ats.manager.wx;
 
+import cn.com.taiji.ats.manager.handler.wx.WxMessageManager;
+import cn.com.taiji.common.manager.net.http.ServiceHandleException;
+import cn.com.taiji.core.model.comm.protocol.ats.weiXin.WxMpIsSubscribedRequest;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
 import cn.com.taiji.ats.Application;
@@ -16,16 +21,16 @@ import cn.com.taiji.ats.manager.AbstractCommManager;
 @SpringBootTest(classes = Application.class)
 public class TestWxMpIsSubscribedManager extends AbstractCommManager {
 
-//    @Autowired
-//    private WxMpIsSubscribedManager wxMpIsSubscribedManager;
-//
-//    @Test
-//    public void test() throws ServiceHandleException {
-//        WxMpIsSubscribedRequest request = new WxMpIsSubscribedRequest();
-//        request.setClientId("bfc4040bda90473d8ceab246555361a3");
-//        request.setOpenId("ogb3at_BW9zRd0GRPrBsNjthwGeA");
-//        wxMpIsSubscribedManager.serviceHandle(request);
-//    }
+    @Autowired
+    private WxMessageManager wxMessageManager;
+
+    @Test
+    public void test() throws ServiceHandleException {
+        WxMpIsSubscribedRequest request = new WxMpIsSubscribedRequest();
+        request.setClientId("bfc4040bda90473d8ceab246555361a3");
+        request.setOpenId("ogb3at_BW9zRd0GRPrBsNjthwGeA");
+        wxMessageManager.isSubscribed(request);
+    }
 
 
 }

zhywpt-service-ods/src/main/java/cn/com/taiji/ods/manager/ois/issue/IssueCommManager.java

@@ -25,15 +25,15 @@ public abstract class IssueCommManager {
         dsiCustomerInfo.setRegisteredDate(customerInfo.getRegisteredDate());
         dsiCustomerInfo.setSeriseNo(customerInfo.getSeriseNo());
         dsiCustomerInfo.setCustomerType(customerInfo.getUserType().getCode());
-        dsiCustomerInfo.setCustomerName(customerInfo.getCustoemrName());
-        dsiCustomerInfo.setCustomerIdType(customerInfo.getCustomerIdtype().getCode());
-        dsiCustomerInfo.setCustomerIdNum(customerInfo.getCustomerIdnum());
+        dsiCustomerInfo.setCustomerName(customerInfo.getCustomerName());
+        dsiCustomerInfo.setCustomerIdType(customerInfo.getCustomerIdType().getCode());
+        dsiCustomerInfo.setCustomerIdNum(customerInfo.getCustomerIdNum());
         dsiCustomerInfo.setTel(customerInfo.getCustomerTel());
         dsiCustomerInfo.setAddress(customerInfo.getCustomerAddress());
         dsiCustomerInfo.setDepartment(customerInfo.getDepartment());
         dsiCustomerInfo.setAgentName(customerInfo.getAgentName());
         dsiCustomerInfo.setAgentIdType(customerInfo.getAgentIdtype().getCode());
-        dsiCustomerInfo.setAgentIdNum(customerInfo.getAgentIdnum());
+        dsiCustomerInfo.setAgentIdNum(customerInfo.getAgentIdNum());
         dsiCustomerInfo.setChannelId(customerInfo.getChannelId());
         dsiCustomerInfo.setStatus(customerInfo.getStatus());
 //        dsiCustomerInfo.setDaspRegisteredTime(customerInfo.getDaspRegisteredTime());
@@ -62,7 +62,7 @@ public abstract class IssueCommManager {
         dsiVehicleInfo.setEmergencyFlag(vehicleInfo.getEmergencyFlag() == null ? 0 : Integer.parseInt(vehicleInfo.getEmergencyFlag()));
         dsiVehicleInfo.setVehicleId(vehicleInfo.getVehicleId());
         dsiVehicleInfo.setVehiclePlate(vehicleInfo.getVehiclePlate());
-        dsiVehicleInfo.setVehiclePlateColor(vehicleInfo.getVehiclePlatecolor());
+        dsiVehicleInfo.setVehiclePlateColor(vehicleInfo.getVehiclePlateColor());
         dsiVehicleInfo.setCustomerId(vehicleInfo.getCustomerId());
         dsiVehicleInfo.setType(vehicleInfo.getType());
         dsiVehicleInfo.setUseCharacter(vehicleInfo.getUseCharacter());
@@ -80,8 +80,8 @@ public abstract class IssueCommManager {
         dsiVehicleInfo.setAxleCount(vehicleInfo.getAxleCount());
         dsiVehicleInfo.setIssueDate(vehicleInfo.getIssueDate());
         dsiVehicleInfo.setOwnerName(vehicleInfo.getOwnerName());
-        dsiVehicleInfo.setOwnerIdType(vehicleInfo.getOwnerIdtype().getCode());
-        dsiVehicleInfo.setOwnerIdNum(vehicleInfo.getOwnerIdnum());
+        dsiVehicleInfo.setOwnerIdType(vehicleInfo.getOwnerIdType().getCode());
+        dsiVehicleInfo.setOwnerIdNum(vehicleInfo.getOwnerIdNum());
         dsiVehicleInfo.setAgreementId(vehicleInfo.getAgreementId());
         dsiVehicleInfo.setChannelId(vehicleInfo.getChannelId());
 //        if (vehicleInfo.getCustomerInfo() != null) {
@@ -102,7 +102,7 @@ public abstract class IssueCommManager {
 //        dsiVehicleInfo.setVehicleFeatureVersion(vehicleInfo.getVehicleFeatureVersion());
 //        dsiVehicleInfo.setVehicleFeatureCode(vehicleInfo.getVehicleFeatureCode());
 //        dsiVehicleInfo.setPayAccountNum(vehicleInfo.getPayAccountNum());
-        dsiVehicleInfo.setWheelCount(vehicleInfo.getVehicleWheelcount());
+        dsiVehicleInfo.setWheelCount(vehicleInfo.getVehicleWheelCount());
         dsiVehicleInfo.setUploadStatus(vehicleInfo.getUploadStatus());
         dsiVehicleInfo.setDaspVehicleId(vehicleInfo.getDaspVehicleId());
 //        dsiVehicleInfo.setDaspSign(vehicleInfo.getDaspSign());
@@ -136,7 +136,7 @@ public abstract class IssueCommManager {
         dsiCardInfo.setAccountId(cardInfo.getAccountId());
         dsiCardInfo.setPackageEnableTime(cardInfo.getPackageEnableTime());
         dsiCardInfo.setCardVersion(DeviceVersion.cardFromDeviceVersion(cardInfo.getCardVersion()));
-        dsiCardInfo.setApplyStaffId(cardInfo.getApplyStaffId());
+//        dsiCardInfo.setApplyStaffId(cardInfo.getApplyStaffId());
 //        if (cardInfo.getCustomer() != null) {
 //            DsiCustomerInfo customerInfo = new DsiCustomerInfo();
 //            enc(customerInfo, cardInfo.getCustomer());
@@ -147,7 +147,7 @@ public abstract class IssueCommManager {
 //            enc(vehicleInfo, cardInfo.getVehicle());
 //            dsiCardInfo.setVehicle(vehicleInfo);
 //        }
-        dsiCardInfo.setConfirmStaffId(cardInfo.getConfirmStaffId());
+//        dsiCardInfo.setConfirmStaffId(cardInfo.getConfirmStaffId());
 //        dsiCardInfo.setUploadStatus(cardInfo.getUploadStatus());
         dsiCardInfo.setDebitType(cardInfo.getDebitType());
     }
@@ -155,13 +155,13 @@ public abstract class IssueCommManager {
     public static void enc(DsiOBUInfo dsiOBUInfo, QtkObuInfo obuInfo) {
         dsiOBUInfo.setId(obuInfo.getId());
         dsiOBUInfo.setObuId(obuInfo.getObuId());
-        dsiOBUInfo.setNetId(obuInfo.getObuNetid());
+        dsiOBUInfo.setNetId(obuInfo.getObuNetId());
         dsiOBUInfo.setBrand(Integer.valueOf(obuInfo.getObuBrand()));
 //        dsiOBUInfo.setModel(obuInfo.getObuModel());
         dsiOBUInfo.setCustomerId(obuInfo.getCustomerId());
         dsiOBUInfo.setVehicleId(obuInfo.getVehicleId());
-        dsiOBUInfo.setEnableTime(obuInfo.getObuEnabletime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-        dsiOBUInfo.setExpireTime(obuInfo.getObuExpiretime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        dsiOBUInfo.setEnableTime(obuInfo.getObuEnableTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        dsiOBUInfo.setExpireTime(obuInfo.getObuExpireTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
         dsiOBUInfo.setRegisteredType(obuInfo.getRegisteredType());
         dsiOBUInfo.setRegisteredChannelId(obuInfo.getRegisteredChannelId());
         dsiOBUInfo.setRegisteredTime(obuInfo.getRegisteredTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));

zhywpt-service-ods/src/main/java/cn/com/taiji/ods/manager/oqs/issue/IssueCommManager.java

@@ -56,15 +56,15 @@ public abstract class IssueCommManager {
         customerInfo.setRegisteredDate(dsiCustomerInfo.getRegisteredDate());
         customerInfo.setSeriseNo(dsiCustomerInfo.getSeriseNo());
         customerInfo.setUserType(UserType.fromCode(dsiCustomerInfo.getCustomerType()));
-        customerInfo.setCustoemrName(dsiCustomerInfo.getCustomerName());
-        customerInfo.setCustomerIdtype(IdType.findByCode(dsiCustomerInfo.getCustomerIdType()));
-        customerInfo.setCustomerIdnum(dsiCustomerInfo.getCustomerIdNum());
+        customerInfo.setCustomerName(dsiCustomerInfo.getCustomerName());
+        customerInfo.setCustomerIdType(IdType.findByCode(dsiCustomerInfo.getCustomerIdType()));
+        customerInfo.setCustomerIdNum(dsiCustomerInfo.getCustomerIdNum());
         customerInfo.setCustomerTel(dsiCustomerInfo.getTel());
         customerInfo.setCustomerAddress(dsiCustomerInfo.getAddress());
         customerInfo.setDepartment(dsiCustomerInfo.getDepartment());
         customerInfo.setAgentName(dsiCustomerInfo.getAgentName());
         customerInfo.setAgentIdtype(IdType.findByCode(dsiCustomerInfo.getAgentIdType()));
-        customerInfo.setAgentIdnum(dsiCustomerInfo.getAgentIdNum());
+        customerInfo.setAgentIdNum(dsiCustomerInfo.getAgentIdNum());
         customerInfo.setChannelId(dsiCustomerInfo.getChannelId());
         customerInfo.setStatus(dsiCustomerInfo.getStatus());
 //        customerInfo.setDaspRegisteredTime(dsiCustomerInfo.getDaspRegisteredTime());
@@ -93,7 +93,7 @@ public abstract class IssueCommManager {
         vehicleInfo.setEmergencyFlag(dsiVehicleInfo.getEmergencyFlag()+"");
         vehicleInfo.setVehicleId(dsiVehicleInfo.getVehicleId());
         vehicleInfo.setVehiclePlate(dsiVehicleInfo.getVehiclePlate());
-        vehicleInfo.setVehiclePlatecolor(dsiVehicleInfo.getVehiclePlateColor());
+        vehicleInfo.setVehiclePlateColor(dsiVehicleInfo.getVehiclePlateColor());
         vehicleInfo.setCustomerId(dsiVehicleInfo.getCustomerId());
         vehicleInfo.setType(dsiVehicleInfo.getType());
         vehicleInfo.setUseCharacter(dsiVehicleInfo.getUseCharacter());
@@ -111,8 +111,8 @@ public abstract class IssueCommManager {
         vehicleInfo.setAxleCount(dsiVehicleInfo.getAxleCount());
         vehicleInfo.setIssueDate(dsiVehicleInfo.getIssueDate());
         vehicleInfo.setOwnerName(dsiVehicleInfo.getOwnerName());
-        vehicleInfo.setOwnerIdtype(IdType.findByCode(dsiVehicleInfo.getOwnerIdType()));
-        vehicleInfo.setOwnerIdnum(dsiVehicleInfo.getOwnerIdNum());
+        vehicleInfo.setOwnerIdType(IdType.findByCode(dsiVehicleInfo.getOwnerIdType()));
+        vehicleInfo.setOwnerIdNum(dsiVehicleInfo.getOwnerIdNum());
         vehicleInfo.setAgreementId(dsiVehicleInfo.getAgreementId());
         vehicleInfo.setChannelId(dsiVehicleInfo.getChannelId());
         if (dsiVehicleInfo.getCustomerInfo() != null) {
@@ -133,7 +133,7 @@ public abstract class IssueCommManager {
 //        vehicleInfo.setVehicleFeatureVersion(dsiVehicleInfo.getVehicleFeatureVersion());
 //        vehicleInfo.setVehicleFeatureCode(dsiVehicleInfo.getVehicleFeatureCode());
 //        vehicleInfo.setPayAccountNum(dsiVehicleInfo.getPayAccountNum());
-        vehicleInfo.setVehicleWheelcount(dsiVehicleInfo.getWheelCount());
+        vehicleInfo.setVehicleWheelCount(dsiVehicleInfo.getWheelCount());
         vehicleInfo.setUploadStatus(dsiVehicleInfo.getUploadStatus());
         vehicleInfo.setDaspVehicleId(dsiVehicleInfo.getDaspVehicleId());
 //        vehicleInfo.setDaspSign(dsiVehicleInfo.getDaspSign());
@@ -165,8 +165,8 @@ public abstract class IssueCommManager {
         cardInfo.setPackageEnableTime(dsiCardInfo.getPackageEnableTime());
         cardInfo.setAccountId(dsiCardInfo.getAccountId());
         cardInfo.setCardVersion(dsiCardInfo.getCardVersion().getNewVersion());
-        cardInfo.setApplyStaffId(dsiCardInfo.getApplyStaffId());
-        cardInfo.setConfirmStaffId(dsiCardInfo.getConfirmStaffId());
+//        cardInfo.setApplyStaffId(dsiCardInfo.getApplyStaffId());
+//        cardInfo.setConfirmStaffId(dsiCardInfo.getConfirmStaffId());
 //        cardInfo.setUploadStatus(dsiCardInfo.getUploadStatus());
 //        cardInfo.setAccountOrganization(dsiCardInfo.getAccountOrganization());
 //        cardInfo.setAccountCardNo(dsiCardInfo.getAccountCardNo());
@@ -188,14 +188,14 @@ public abstract class IssueCommManager {
         obuInfo.setInsertTime(TimeTools.calendar2LocalDateTime(dsiOBUInfo.getCreateTime()));
         obuInfo.setUpdateTime(TimeTools.calendar2LocalDateTime(dsiOBUInfo.getUpdateTime()));
         obuInfo.setObuId(dsiOBUInfo.getObuId());
-        obuInfo.setObuNetid(dsiOBUInfo.getNetId());
+        obuInfo.setObuNetId(dsiOBUInfo.getNetId());
         obuInfo.setCustomerId(dsiOBUInfo.getCustomerId());
         obuInfo.setVehicleId(dsiOBUInfo.getVehicleId());
         obuInfo.setObuBrand(dsiOBUInfo.getBrand()+"");
 //        obuInfo.setObuModel(dsiOBUInfo.getModel());
         obuInfo.setAgencyId(dsiOBUInfo.getRegisteredChannelId().substring(0, 11));
-        obuInfo.setObuEnabletime(LocalDateTime.parse(dsiOBUInfo.getEnableTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-        obuInfo.setObuExpiretime(LocalDateTime.parse(dsiOBUInfo.getExpireTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        obuInfo.setObuEnableTime(LocalDateTime.parse(dsiOBUInfo.getEnableTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        obuInfo.setObuExpireTime(LocalDateTime.parse(dsiOBUInfo.getExpireTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
         obuInfo.setChannelId(dsiOBUInfo.getRegisteredChannelId());
         obuInfo.setRegisteredType(dsiOBUInfo.getRegisteredType());
         obuInfo.setRegisteredChannelId(dsiOBUInfo.getRegisteredChannelId());