anderx 1 год назад
Родитель
Сommit
5dd3037177

+ 74 - 13
src/main/java/com/goafanti/common/dao/TOrderNewMapper.java

@@ -10,29 +10,89 @@ import com.goafanti.order.bo.*;
 import com.goafanti.order.bo.outStatistics.OutOrderSalesSourceAmount;
 import com.goafanti.organization.bo.OrganizationListOut;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.data.domain.Pageable;
 
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+
 /**
-* @author Administrator
-* @description 针对表【t_order_new(订单表)】的数据库操作Mapper
-* @createDate 2024-06-19 17:07:06
-* @Entity com.goafanti.common.model.TOrderNew
-*/
+ * 订单表(TOrderNew)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-09-27 16:04:11
+ */
 public interface TOrderNewMapper {
-    int deleteByPrimaryKey(String orderNo);
 
-    int insert(TOrderNew record);
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param orderNo 主键
+     * @return 实例对象
+     */
+    TOrderNew queryById(String orderNo);
 
-    int insertSelective(TOrderNew record);
 
-    TOrderNew selectByPrimaryKey(String orderNo);
+    /**
+     * 查询指定行数据
+     *
+     * @param tOrderNew 查询条件
+     * @param pageable  分页对象
+     * @return 对象列表
+     */
+    List<TOrderNew> findTOrderNewList(TOrderNew tOrderNew, @Param("pageable") Pageable pageable);
 
-    int updateByPrimaryKeySelective(TOrderNew record);
+    /**
+     * 统计总行数
+     *
+     * @param tOrderNew 查询条件
+     * @return 总行数
+     */
+    int findTOrderNewCount(TOrderNew tOrderNew);
+
+    /**
+     * 新增数据
+     *
+     * @param tOrderNew 实例对象
+     * @return 影响行数
+     */
+    int insert(TOrderNew tOrderNew);
 
-    int updateByPrimaryKey(TOrderNew record);
+    /**
+     * 批量新增数据(MyBatis原生foreach方法)
+     *
+     * @param entities List<TOrderNew> 实例对象列表
+     * @return 影响行数
+     */
+    int insertBatch(@Param("entities") List<TOrderNew> entities);
+
+    /**
+     * 批量新增或按主键更新数据(MyBatis原生foreach方法)
+     *
+     * @param entities List<TOrderNew> 实例对象列表
+     * @return 影响行数
+     * @throws org.springframework.jdbc.BadSqlGrammarException 入参是空List的时候会抛SQL语句错误的异常,请自行校验入参
+     */
+    int insertOrUpdateBatch(@Param("entities") List<TOrderNew> entities);
+
+    /**
+     * 修改数据
+     *
+     * @param tOrderNew 实例对象
+     * @return 影响行数
+     */
+    int update(TOrderNew tOrderNew);
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param orderNo 主键
+     * @return 影响行数
+     */
+    int deleteById(String orderNo);
+
+    int insertSelective(TOrderNew record);
 
     TOrderNewBo getOrderNewDetail(String orderNo);
     int getCountByIdAndStatus(TOrderNew orderNew);
@@ -51,13 +111,13 @@ public interface TOrderNewMapper {
 
     int updateFinance(@Param("aid")String aid, @Param("orderNos") List<String> orderNos, @Param("newFinance")String newFinance);
     int checkContractNo(String sno);
-    Map<String, Object> countTotalAndActually(@Param("o") OrderListBo o, @Param("fids") List<String> fids, @Param("deps")List<String> listDep,@Param("types")List<String> types);
+    Map<String, Object> countTotalAndActually(@Param("o") OrderListBo o, @Param("fids") List<String> fids, @Param("deps")List<String> listDep, @Param("types")List<String> types);
     TOrderBillNew getLastPayment(String orderNo);
     int updateSalesmanId(@Param("aid")String aid, @Param("transferId")String transferId);
     List<TOrderNewBo> selectUsedOrderByOrder(String orderNo);
     void updaterefund(TOrderNew o);
 
-    List<BigDecimal> selectByUidAndNewUser(@Param("uid")String uid,@Param("aid")String aid, @Param("newUser")Integer newUser, @Param("date") Date date, @Param("now")Date now);
+    List<BigDecimal> selectByUidAndNewUser(@Param("uid")String uid, @Param("aid")String aid, @Param("newUser")Integer newUser, @Param("date") Date date, @Param("now")Date now);
 
     List<OutStatisticsList> statisticsList(InputStatistics in);
 
@@ -117,3 +177,4 @@ public interface TOrderNewMapper {
     List<String> selectByDepAndProcess(@Param("depId") String depId, @Param("processStatus") Integer processStatus);
 
 }
+

Разница между файлами не показана из-за своего большого размера
+ 2571 - 2199
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml


+ 21 - 345
src/main/java/com/goafanti/common/model/TOrderNew.java

@@ -4,156 +4,131 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
+
 /**
- * 订单表
- * @TableName t_order_new
+ * 订单表(TOrderNew)实体类
+ *
+ * @author makejava
+ * @since 2024-09-27 16:04:11
  */
 public class TOrderNew implements Serializable {
+    private static final long serialVersionUID = 136119537408285619L;
     /**
      * 订单编号
      */
     private String orderNo;
-
     /**
      * 订单类型 0认证项目 1科技项目 2 两化融化管理体系认证项目
      */
     private Integer orderType;
-
     /**
      * 创建人
      */
     private String creater;
-
     /**
      * 创建时间
      */
     private Date createTime;
-
     /**
      * 更新时间
      */
     private Date updateTime;
-
     /**
      * 买方id
      */
     private String buyerId;
-
     /**
      * 首付金额
      */
     private BigDecimal firstAmount;
-
     /**
      * 总金额
      */
     private BigDecimal totalAmount;
-
     /**
      * 已收金额
      */
     private BigDecimal settlementAmount;
-
     /**
      * 退款金额
      */
     private BigDecimal refundAmount;
-
     /**
      * 订单状态 0-待签单,1-签单待审,2-签单审核通过,3-签单审核拒绝,4-已结项,5-已驳回,6-已退单
      */
     private Integer orderStatus;
-
     /**
      * 清算状态 0-首付待付请,1-尾款待付清,2-已付请,3-部分退款,4-全部退款
      */
     private Integer liquidationStatus;
-
     /**
      * 流程状态 0=营销员,1=经理,2=营销管理员,3=财务与技术总监,4=总裁,5=技术总监派单,6部分分配,7全部分配
      */
     private Integer processStatus;
-
     /**
      * 项目状态 0-项目待提交 1-项目已提交,2-项目评审,3-项目立项,4-项目公示,5-项目抽查,6-项目备案,7-项目下证,8-项目验收,9-项目拨款
      */
     private Integer projectStatus;
-
     /**
      * 特批状态 0-非特批 ,1-总裁待审核,2-总裁通过,3-总裁驳回 4董事长待审核 5董事长通过 6董事长驳回
      */
     private Integer approval;
-
     /**
      * 订单备注
      */
     private String orderRemarks;
-
     /**
      * 0正常 1作废 2锁定 3变更中
      */
     private Integer deleteSign;
-
     /**
      * 营销员id
      */
     private String salesmanId;
-
     /**
      * 财务id
      */
     private String financeId;
-
     /**
      * 技术员id
      */
     private String technicianId;
-
     /**
      * 签单日期
      */
     private Date signTime;
-
     /**
      * 结算日期
      */
     private Date settlementTime;
-
     /**
      * 合同图片
      */
     private String contractPictureUrl;
-
     /**
      * 合同编号
      */
     private String contractNo;
-
     /**
      * 业务品类
      */
     private String contractType;
-
     /**
      * 企业负责人
      */
     private String contacts;
-
     /**
      * 负责人联系电话
      */
     private String contactMobile;
-
     /**
      * 企业法人
      */
     private String legalPerson;
-
     /**
      * 法人联系电话
      */
     private String legalPersonTel;
-
     /**
      * 校对单量
      */
@@ -163,782 +138,483 @@ public class TOrderNew implements Serializable {
      * 校对人
      */
     private String proofAid;
-
     /**
      * 校对时间
      */
     private Date proofTime;
-
     /**
      * 校对状态(0-未校对 1已校对)
      */
     private Integer proofStatus;
-
     /**
      * 订单部门
      */
     private String orderDep;
-
     /**
      * 外包 0否 1是
      */
     private Integer outsource;
-
     /**
      * 附加订单
      */
     private String additionalOrder;
-
     /**
      * 原订单
      */
     private String primaryOrder;
-
     /**
      * 原营销员id
      */
     private String oldSalesmanId;
-
     /**
      * 驳回位置 (同流程状态)
      */
     private Integer backStatus;
-
     /**
      * 补充协议
      */
     private String agreementUrl;
-
     /**
      * 客户类型 0新客户 1老客户
      */
     private Integer newUser;
-
     /**
      * 服务内容
      */
     private String serviceContent;
-
     /**
      * 销售类型 0=电话新开发,1=电话自带资源,2=网络,3=渠道,4=转介绍,5=其他,6=高新复购,7=其他复购
      */
     private Integer salesType;
-
     /**
      * 渠道客户编号
      */
     private String channelId;
-
     /**
      * 销售其他描述
      */
     private String other;
-
     /**
      * 客户类型 0私有客户 1签单客户 2=限定项目客户
      */
     private Integer userType;
-
     /**
      * 审核人员名称
      */
     private String examineName;
-
     /**
      * 标签 0=默认,1=待处理,2=待派单,3=暂不处理,4=已过期,已作废
      */
     private Integer tag;
-
     /**
      * 0=客户自己完成,1=非客户自己完成
      */
     private Integer patentStatus;
-
-    private static final long serialVersionUID = 1L;
-
     /**
-     * 订单编号
+     * 0=无,1=待评分,2=部分评分,3=全部评分
      */
+    private Integer scoreStatus;
+
+
     public String getOrderNo() {
         return orderNo;
     }
 
-    /**
-     * 订单编号
-     */
     public void setOrderNo(String orderNo) {
         this.orderNo = orderNo;
     }
 
-    /**
-     * 订单类型 0认证项目 1科技项目 2 两化融化管理体系认证项目
-     */
     public Integer getOrderType() {
         return orderType;
     }
 
-    /**
-     * 订单类型 0认证项目 1科技项目 2 两化融化管理体系认证项目
-     */
     public void setOrderType(Integer orderType) {
         this.orderType = orderType;
     }
 
-    /**
-     * 创建人
-     */
     public String getCreater() {
         return creater;
     }
 
-    /**
-     * 创建人
-     */
     public void setCreater(String creater) {
         this.creater = creater;
     }
 
-    /**
-     * 创建时间
-     */
     public Date getCreateTime() {
         return createTime;
     }
 
-    /**
-     * 创建时间
-     */
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
 
-    /**
-     * 更新时间
-     */
     public Date getUpdateTime() {
         return updateTime;
     }
 
-    /**
-     * 更新时间
-     */
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
 
-    /**
-     * 买方id
-     */
     public String getBuyerId() {
         return buyerId;
     }
 
-    /**
-     * 买方id
-     */
     public void setBuyerId(String buyerId) {
         this.buyerId = buyerId;
     }
 
-    /**
-     * 首付金额
-     */
     public BigDecimal getFirstAmount() {
         return firstAmount;
     }
 
-    /**
-     * 首付金额
-     */
     public void setFirstAmount(BigDecimal firstAmount) {
         this.firstAmount = firstAmount;
     }
 
-    /**
-     * 总金额
-     */
     public BigDecimal getTotalAmount() {
         return totalAmount;
     }
 
-    /**
-     * 总金额
-     */
     public void setTotalAmount(BigDecimal totalAmount) {
         this.totalAmount = totalAmount;
     }
 
-    /**
-     * 已收金额
-     */
     public BigDecimal getSettlementAmount() {
         return settlementAmount;
     }
 
-    /**
-     * 已收金额
-     */
     public void setSettlementAmount(BigDecimal settlementAmount) {
         this.settlementAmount = settlementAmount;
     }
 
-    /**
-     * 退款金额
-     */
     public BigDecimal getRefundAmount() {
         return refundAmount;
     }
 
-    /**
-     * 退款金额
-     */
     public void setRefundAmount(BigDecimal refundAmount) {
         this.refundAmount = refundAmount;
     }
 
-    /**
-     * 订单状态 0-待签单,1-签单待审,2-签单审核通过,3-签单审核拒绝,4-已结项,5-已驳回,6-已退单
-     */
     public Integer getOrderStatus() {
         return orderStatus;
     }
 
-    /**
-     * 订单状态 0-待签单,1-签单待审,2-签单审核通过,3-签单审核拒绝,4-已结项,5-已驳回,6-已退单
-     */
     public void setOrderStatus(Integer orderStatus) {
         this.orderStatus = orderStatus;
     }
 
-    /**
-     * 清算状态 0-首付待付请,1-尾款待付清,2-已付请,3-部分退款,4-全部退款
-     */
     public Integer getLiquidationStatus() {
         return liquidationStatus;
     }
 
-    /**
-     * 清算状态 0-首付待付请,1-尾款待付清,2-已付请,3-部分退款,4-全部退款
-     */
     public void setLiquidationStatus(Integer liquidationStatus) {
         this.liquidationStatus = liquidationStatus;
     }
 
-    /**
-     * 流程状态 0=营销员,1=经理,2=营销管理员,3=财务与技术总监,4=总裁,5=技术总监派单,6部分分配,7全部分配
-     */
     public Integer getProcessStatus() {
         return processStatus;
     }
 
-    /**
-     * 流程状态 0=营销员,1=经理,2=营销管理员,3=财务与技术总监,4=总裁,5=技术总监派单,6部分分配,7全部分配
-     */
     public void setProcessStatus(Integer processStatus) {
         this.processStatus = processStatus;
     }
 
-    /**
-     * 项目状态 0-项目待提交 1-项目已提交,2-项目评审,3-项目立项,4-项目公示,5-项目抽查,6-项目备案,7-项目下证,8-项目验收,9-项目拨款
-     */
     public Integer getProjectStatus() {
         return projectStatus;
     }
 
-    /**
-     * 项目状态 0-项目待提交 1-项目已提交,2-项目评审,3-项目立项,4-项目公示,5-项目抽查,6-项目备案,7-项目下证,8-项目验收,9-项目拨款
-     */
     public void setProjectStatus(Integer projectStatus) {
         this.projectStatus = projectStatus;
     }
 
-    /**
-     * 特批状态 0-非特批 ,1-总裁待审核,2-总裁通过,3-总裁驳回 4董事长待审核 5董事长通过 6董事长驳回
-     */
     public Integer getApproval() {
         return approval;
     }
 
-    /**
-     * 特批状态 0-非特批 ,1-总裁待审核,2-总裁通过,3-总裁驳回 4董事长待审核 5董事长通过 6董事长驳回
-     */
     public void setApproval(Integer approval) {
         this.approval = approval;
     }
 
-    /**
-     * 订单备注
-     */
     public String getOrderRemarks() {
         return orderRemarks;
     }
 
-    /**
-     * 订单备注
-     */
     public void setOrderRemarks(String orderRemarks) {
         this.orderRemarks = orderRemarks;
     }
 
-    /**
-     * 0正常 1作废 2锁定 3变更中
-     */
     public Integer getDeleteSign() {
         return deleteSign;
     }
 
-    /**
-     * 0正常 1作废 2锁定 3变更中
-     */
     public void setDeleteSign(Integer deleteSign) {
         this.deleteSign = deleteSign;
     }
 
-    /**
-     * 营销员id
-     */
     public String getSalesmanId() {
         return salesmanId;
     }
 
-    /**
-     * 营销员id
-     */
     public void setSalesmanId(String salesmanId) {
         this.salesmanId = salesmanId;
     }
 
-    /**
-     * 财务id
-     */
     public String getFinanceId() {
         return financeId;
     }
 
-    /**
-     * 财务id
-     */
     public void setFinanceId(String financeId) {
         this.financeId = financeId;
     }
 
-    /**
-     * 技术员id
-     */
     public String getTechnicianId() {
         return technicianId;
     }
 
-    /**
-     * 技术员id
-     */
     public void setTechnicianId(String technicianId) {
         this.technicianId = technicianId;
     }
 
-    /**
-     * 签单日期
-     */
     public Date getSignTime() {
         return signTime;
     }
 
-    /**
-     * 签单日期
-     */
     public void setSignTime(Date signTime) {
         this.signTime = signTime;
     }
 
-    /**
-     * 结算日期
-     */
     public Date getSettlementTime() {
         return settlementTime;
     }
 
-    /**
-     * 结算日期
-     */
     public void setSettlementTime(Date settlementTime) {
         this.settlementTime = settlementTime;
     }
 
-    /**
-     * 合同图片
-     */
     public String getContractPictureUrl() {
         return contractPictureUrl;
     }
 
-    /**
-     * 合同图片
-     */
     public void setContractPictureUrl(String contractPictureUrl) {
         this.contractPictureUrl = contractPictureUrl;
     }
 
-    /**
-     * 合同编号
-     */
     public String getContractNo() {
         return contractNo;
     }
 
-    /**
-     * 合同编号
-     */
     public void setContractNo(String contractNo) {
         this.contractNo = contractNo;
     }
 
-    /**
-     * 业务品类
-     */
     public String getContractType() {
         return contractType;
     }
 
-    /**
-     * 业务品类
-     */
     public void setContractType(String contractType) {
         this.contractType = contractType;
     }
 
-    /**
-     * 企业负责人
-     */
     public String getContacts() {
         return contacts;
     }
 
-    /**
-     * 企业负责人
-     */
     public void setContacts(String contacts) {
         this.contacts = contacts;
     }
 
-    /**
-     * 负责人联系电话
-     */
     public String getContactMobile() {
         return contactMobile;
     }
 
-    /**
-     * 负责人联系电话
-     */
     public void setContactMobile(String contactMobile) {
         this.contactMobile = contactMobile;
     }
 
-    /**
-     * 企业法人
-     */
     public String getLegalPerson() {
         return legalPerson;
     }
 
-    /**
-     * 企业法人
-     */
     public void setLegalPerson(String legalPerson) {
         this.legalPerson = legalPerson;
     }
 
-    /**
-     * 法人联系电话
-     */
     public String getLegalPersonTel() {
         return legalPersonTel;
     }
 
-    /**
-     * 法人联系电话
-     */
     public void setLegalPersonTel(String legalPersonTel) {
         this.legalPersonTel = legalPersonTel;
     }
 
-    /**
-     * 校对单量
-     */
     public Double getProofCount() {
         return proofCount;
     }
 
-    /**
-     * 校对单量
-     */
     public void setProofCount(Double proofCount) {
         this.proofCount = proofCount;
     }
 
-    /**
-     * 校对人
-     */
     public String getProofAid() {
         return proofAid;
     }
 
-    /**
-     * 校对人
-     */
     public void setProofAid(String proofAid) {
         this.proofAid = proofAid;
     }
 
-    /**
-     * 校对时间
-     */
     public Date getProofTime() {
         return proofTime;
     }
 
-    /**
-     * 校对时间
-     */
     public void setProofTime(Date proofTime) {
         this.proofTime = proofTime;
     }
 
-    /**
-     * 校对状态(0-未校对 1已校对)
-     */
     public Integer getProofStatus() {
         return proofStatus;
     }
 
-    /**
-     * 校对状态(0-未校对 1已校对)
-     */
     public void setProofStatus(Integer proofStatus) {
         this.proofStatus = proofStatus;
     }
 
-    /**
-     * 订单部门
-     */
     public String getOrderDep() {
         return orderDep;
     }
 
-    /**
-     * 订单部门
-     */
     public void setOrderDep(String orderDep) {
         this.orderDep = orderDep;
     }
 
-    /**
-     * 外包 0否 1是
-     */
     public Integer getOutsource() {
         return outsource;
     }
 
-    /**
-     * 外包 0否 1是
-     */
     public void setOutsource(Integer outsource) {
         this.outsource = outsource;
     }
 
-    /**
-     * 附加订单
-     */
     public String getAdditionalOrder() {
         return additionalOrder;
     }
 
-    /**
-     * 附加订单
-     */
     public void setAdditionalOrder(String additionalOrder) {
         this.additionalOrder = additionalOrder;
     }
 
-    /**
-     * 原订单
-     */
     public String getPrimaryOrder() {
         return primaryOrder;
     }
 
-    /**
-     * 原订单
-     */
     public void setPrimaryOrder(String primaryOrder) {
         this.primaryOrder = primaryOrder;
     }
 
-    /**
-     * 原营销员id
-     */
     public String getOldSalesmanId() {
         return oldSalesmanId;
     }
 
-    /**
-     * 原营销员id
-     */
     public void setOldSalesmanId(String oldSalesmanId) {
         this.oldSalesmanId = oldSalesmanId;
     }
 
-    /**
-     * 驳回位置 (同流程状态)
-     */
     public Integer getBackStatus() {
         return backStatus;
     }
 
-    /**
-     * 驳回位置 (同流程状态)
-     */
     public void setBackStatus(Integer backStatus) {
         this.backStatus = backStatus;
     }
 
-    /**
-     * 补充协议
-     */
     public String getAgreementUrl() {
         return agreementUrl;
     }
 
-    /**
-     * 补充协议
-     */
     public void setAgreementUrl(String agreementUrl) {
         this.agreementUrl = agreementUrl;
     }
 
-    /**
-     * 客户类型 0新客户 1老客户
-     */
     public Integer getNewUser() {
         return newUser;
     }
 
-    /**
-     * 客户类型 0新客户 1老客户
-     */
     public void setNewUser(Integer newUser) {
         this.newUser = newUser;
     }
 
-    /**
-     * 服务内容
-     */
     public String getServiceContent() {
         return serviceContent;
     }
 
-    /**
-     * 服务内容
-     */
     public void setServiceContent(String serviceContent) {
         this.serviceContent = serviceContent;
     }
 
-    /**
-     * 销售类型 0=电话新开发,1=电话自带资源,2=网络,3=渠道,4=转介绍,5=其他,6=高新复购,7=其他复购
-     */
     public Integer getSalesType() {
         return salesType;
     }
 
-    /**
-     * 销售类型 0=电话新开发,1=电话自带资源,2=网络,3=渠道,4=转介绍,5=其他,6=高新复购,7=其他复购
-     */
     public void setSalesType(Integer salesType) {
         this.salesType = salesType;
     }
 
-    /**
-     * 渠道客户编号
-     */
     public String getChannelId() {
         return channelId;
     }
 
-    /**
-     * 渠道客户编号
-     */
     public void setChannelId(String channelId) {
         this.channelId = channelId;
     }
 
-    /**
-     * 销售其他描述
-     */
     public String getOther() {
         return other;
     }
 
-    /**
-     * 销售其他描述
-     */
     public void setOther(String other) {
         this.other = other;
     }
 
-    /**
-     * 客户类型 0私有客户 1签单客户 2=限定项目客户
-     */
     public Integer getUserType() {
         return userType;
     }
 
-    /**
-     * 客户类型 0私有客户 1签单客户 2=限定项目客户
-     */
     public void setUserType(Integer userType) {
         this.userType = userType;
     }
 
-    /**
-     * 审核人员名称
-     */
     public String getExamineName() {
         return examineName;
     }
 
-    /**
-     * 审核人员名称
-     */
     public void setExamineName(String examineName) {
         this.examineName = examineName;
     }
 
-    /**
-     * 标签 0=默认,1=待处理,2=待派单,3=暂不处理,4=已过期,已作废
-     */
     public Integer getTag() {
         return tag;
     }
 
-    /**
-     * 标签 0=默认,1=待处理,2=待派单,3=暂不处理,4=已过期,已作废
-     */
     public void setTag(Integer tag) {
         this.tag = tag;
     }
 
-    /**
-     * 0=客户自己完成,1=非客户自己完成
-     */
     public Integer getPatentStatus() {
         return patentStatus;
     }
 
-    /**
-     * 0=客户自己完成,1=非客户自己完成
-     */
     public void setPatentStatus(Integer patentStatus) {
         this.patentStatus = patentStatus;
     }
-}
+
+    public Integer getScoreStatus() {
+        return scoreStatus;
+    }
+
+    public void setScoreStatus(Integer scoreStatus) {
+        this.scoreStatus = scoreStatus;
+    }
+
+}
+

+ 1 - 1
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -1556,7 +1556,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		for (TOrderNewBo bo : list) {
 			bo.setSalesmanId(aid);
 			bo.setOldSalesmanId(oldAid);
-			tOrderNewMapper.updateByPrimaryKeySelective(bo);
+			tOrderNewMapper.update(bo);
 			TOrderMid mid=new TOrderMid();
 			mid.setOrderNo(bo.getOrderNo());
 			Admin admin = adminMapper.selectByPrimaryKey(aid);

+ 8 - 8
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -105,7 +105,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 				record.setProcessStatus(ProcessStatus.YPCW_JSZJ.getCode());
 			}
 			addOrderLog(orderNo, OrderLogProcess.CWSH.getCode(),null);
-			r = tOrderNewMapper.updateByPrimaryKeySelective(record);
+			r = tOrderNewMapper.update(record);
 		}else{
 			//返回错误标志 提示订单编号或者财务专员选择错误
 			r = -2;
@@ -199,7 +199,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		//设置驳回人为财务、将财务负责人置空
 		orderNew.setBackStatus(3);
 		orderNew.setFinanceId("");
-		int c = tOrderNewMapper.updateByPrimaryKeySelective(orderNew);
+		int c = tOrderNewMapper.update(orderNew);
 
 		//新增驳回数据
 		if(c>0){
@@ -305,7 +305,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		orderNew.setSettlementAmount(billNew.getTransactionAmount().add(o.getSettlementAmount()));
 		orderNew.setLiquidationStatus(lstaus);
 		if(result > 0){
-			result = tOrderNewMapper.updateByPrimaryKeySelective(orderNew);
+			result = tOrderNewMapper.update(orderNew);
 			//如果达到奖金发放要求新增奖金信息
 			if(null != bonus.getBonusSubject()){
 				bonus.setId(UUID.randomUUID().toString());
@@ -334,7 +334,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 			record.setOrderNo(o.getOrderNo());
 			record.setOrderStatus(OrderNewState.YTD.getCode());//7
 			record.setProofCount(0.0d);//订单单量为0
-			tOrderNewMapper.updateByPrimaryKeySelective(record);
+			tOrderNewMapper.update(record);
 
 			//更新统计表
 			updateCount(o.getOrderNo());
@@ -433,7 +433,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 			//orderNew.setProcessStatus(6);
 		}
 		if(result > 0){
-			result = tOrderNewMapper.updateByPrimaryKeySelective(orderNew);
+			result = tOrderNewMapper.update(orderNew);
 		}
 		return result;
 	}
@@ -456,7 +456,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		orderNew.setProofStatus(1);
 		//校对时间
 		orderNew.setProofTime(new Date());
-		tOrderNewMapper.updateByPrimaryKeySelective(orderNew);
+		tOrderNewMapper.update(orderNew);
 
 		updateCount(orderNew.getOrderNo());
 		return 0;
@@ -479,7 +479,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 
 	@Override
 	public int updateContractNo(TOrderNew orderNew) {
-		return tOrderNewMapper.updateByPrimaryKeySelective(orderNew);
+		return tOrderNewMapper.update(orderNew);
 	}
 
 	@Override
@@ -540,7 +540,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 			t.setExamineName(str.substring(0,str.length()-1));
 		}
 
-		tOrderNewMapper.updateByPrimaryKeySelective(t);
+		tOrderNewMapper.update(t);
 		return 1;
 	}
 

+ 6 - 11
src/main/java/com/goafanti/order/service/impl/OrderBillServiceImpl.java

@@ -1,16 +1,6 @@
 package com.goafanti.order.service.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import com.goafanti.admin.service.DepartmentService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.dao.TOrderBillNewMapper;
@@ -22,6 +12,11 @@ import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.order.enums.LiquidationNewState;
 import com.goafanti.order.service.OrderBillService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
 
 @Service
 public class OrderBillServiceImpl extends BaseMybatisDao<TOrderBillNewMapper> implements OrderBillService {
@@ -76,7 +71,7 @@ public class OrderBillServiceImpl extends BaseMybatisDao<TOrderBillNewMapper> im
 		}else if(o2.getSettlementAmount().compareTo(o.getTotalAmount())== 0) {
 			o2.setLiquidationStatus(LiquidationNewState.ALREADY_PAY.getCode());
 		}
-		tOrderNewMapper.updateByPrimaryKeySelective(o2);
+		tOrderNewMapper.update(o2);
 		TOrderBillNew ntbn=new TOrderBillNew();
 		ntbn.setBillNo(tbn.getBillNo());
 		ntbn.setDeleteSign((byte)1);

+ 5 - 5
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -105,7 +105,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		TOrderNew ton=new TOrderNew();
 		ton.setOrderNo(t.getOrderNo());
 		ton.setDeleteSign(2);//将订单置为锁定
-		tOrderNewMapper.updateByPrimaryKeySelective(ton);
+		tOrderNewMapper.update(ton);
 		BigDecimal invoiceAmount=tOrderInvoiceMapper.conutAmountByOrderNo(t.getOrderNo());
 		t.setInvoiceAmount(invoiceAmount);//开票金额
 		BigDecimal paymentAmount=tOrderBillNewMapper.conutAmountByOrderNo(t.getOrderNo());
@@ -699,7 +699,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			tOrderMidMapper.updateByOrderNo(tm);
 		}
 
-		tOrderNewMapper.updateByPrimaryKeySelective(orderNew);
+		tOrderNewMapper.update(orderNew);
 	}
 
 
@@ -785,7 +785,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			if(t.getType()==OrderChangeType.KJXY.getCode()){
 				ton.setTotalAmount(t.getTotalAmount());
 			}
-			tOrderNewMapper.updateByPrimaryKeySelective(ton);
+			tOrderNewMapper.update(ton);
 			TOrderNewBo tOrderNew = tOrderNewMapper.getSaleIdByOno(t.getOrderNo());
 			if (t.getType()!=OrderChangeType.JBGGT.getCode()){
 			//不是仅合同变更就看营销经理是否存在
@@ -1086,7 +1086,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		if (nob.getContractPictureUrl()!=null)o.setContractPictureUrl(nob.getContractPictureUrl());
 		//清算状态 0-首付待付请,1-尾款待付清,2-已付请,3-部分退款,4-全部退款
 		o.setLiquidationStatus(OrderUtils.getLiquidationStatus(o));
-		tOrderNewMapper.updateByPrimaryKeySelective(o);
+		tOrderNewMapper.update(o);
 		orderProjectService.updateMidServiceProject(o.getOrderNo());
 		return o;
 	}
@@ -1603,7 +1603,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				t.setOrderNo(nb.getOrderNo());
 				t.setDeleteSign(0);
 				addOrderChangeLog("变更撤销成功", 5, nb.getOrderNo(), nb.getId());
-				tOrderNewMapper.updateByPrimaryKeySelective(t);
+				tOrderNewMapper.update(t);
 				return 1;
 			}
 

+ 10 - 10
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -647,7 +647,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				t.setLiquidationStatus(LiquidationNewState.WAIT_PAY_FIRST_BALANCE.getCode());
 			}
 		}
-		tOrderNewMapper.updateByPrimaryKeySelective(t);
+		tOrderNewMapper.update(t);
 		pushOrderDunContent(t2);
 		//计算公出统计
 		pushOrderPublicReleaseCount(t2);
@@ -873,7 +873,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		}
 		addOrderLog(tl,reason);
 		pushGeneralSendNoticeAndEmail(aids, noticeType,order, TokenManager.getAdminId(),t2.getApproval());
-		return tOrderNewMapper.updateByPrimaryKeySelective(t);
+		return tOrderNewMapper.update(t);
 	}
 
 
@@ -1351,7 +1351,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@Override
 	public int updateSalesType(TOrderNew in) {
-		return tOrderNewMapper.updateByPrimaryKeySelective(in);
+		return tOrderNewMapper.update(in);
 	}
 
 
@@ -1400,7 +1400,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		t.setOrderStatus(orderStatus);
 		//设置审核人员名称
 		pushExamineName(t);
-		tOrderNewMapper.updateByPrimaryKeySelective(t);
+		tOrderNewMapper.update(t);
 		if (aids.isEmpty()) {
 			throw new BusinessException(new Error( "邮件发送失败,对方设置邮箱错误","邮件发送失败,对方设置邮箱错误"));
 		}
@@ -1723,7 +1723,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		TOrderNew tOrder=new TOrderNew();
 		tOrder.setOrderNo(t.getOrderNo());
 		tOrder.setOrderStatus(OrderNewState.TDZ.getCode());
-		tOrderNewMapper.updateByPrimaryKeySelective(tOrder);
+		tOrderNewMapper.update(tOrder);
 		TOrderLog tl=new TOrderLog();
 		tl.setOrderNo(t.getOrderNo());
 		tl.setProcess(OrderLogProcess.FQTD.getCode());
@@ -1770,7 +1770,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		order.setProcessStatus(t.getProcessStatus());
 		pushGeneralSendNoticeAndEmail(aids, type,order, TokenManager.getAdminId(),t2.getApproval());
 		//新增特批催款信息
-		tOrderNewMapper.updateByPrimaryKeySelective(t);
+		tOrderNewMapper.update(t);
 		updateAdminUserCountOrder(t2.getSalesmanId(),t2.getCreateTime());
 		return 1;
 	}
@@ -1841,7 +1841,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				contractNoReplace(orderNo, t.getContractNo(),t.getOrderDep());
 			}
 			t.setContractNo("");
-			return tOrderNewMapper.updateByPrimaryKeySelective(t);
+			return tOrderNewMapper.update(t);
 		}
 		return -1;
 	}
@@ -1982,7 +1982,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		}
 		t.setOrderStatus(OrderNewState.YJX.getCode());
 		t.setSettlementTime(new Date());
-		return tOrderNewMapper.updateByPrimaryKeySelective(t);
+		return tOrderNewMapper.update(t);
 	}
 
 	@Override
@@ -2007,7 +2007,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		aids.add(t.getSalesmanId());
 		TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(orderNo);
 		pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_NO.getCode(),order, TokenManager.getAdminId(),t.getApproval());
-		tOrderNewMapper.updateByPrimaryKeySelective(t);
+		tOrderNewMapper.update(t);
 		updateAdminUserCountOrder(t.getSalesmanId(),t.getCreateTime());
 		financeCountOrderUnauditedSubtraction(t,2);
 		return 1;
@@ -2498,7 +2498,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		t.setAgreementUrl(agreementUrl);
 		t.setServiceContent(serviceContent);
 		if (t.getContractPictureUrl()!=null||t.getAgreementUrl()!=null||t.getServiceContent()!=null){
-			return tOrderNewMapper.updateByPrimaryKeySelective(t);
+			return tOrderNewMapper.update(t);
 		}
 		return 0;
 	}

+ 4 - 4
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -405,7 +405,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		tNew.setOrderNo(orderNo);
 		tNew.setProcessStatus(getOrderProcessStatus(orderNo));
 		tNew.setExamineName("");
-		tOrderNewMapper.updateByPrimaryKeySelective(tNew);
+		tOrderNewMapper.update(tNew);
 		updateMidServiceProject(orderNo);
 	}
 
@@ -567,7 +567,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		if(StringUtils.isNotEmpty(t.getContactMobile()))	tn.setContactMobile(t.getContactMobile());
 		if(StringUtils.isNotEmpty(t.getLegalPerson()))tn.setLegalPerson(t.getLegalPerson());
 		if(StringUtils.isNotEmpty(t.getLegalPersonTel()))tn.setLegalPersonTel(t.getLegalPersonTel());
-		tOrderNewMapper.updateByPrimaryKeySelective(tn);
+		tOrderNewMapper.update(tn);
 		//修改公司地址信息
 		if (null!=t.getLocationProvince()||null!=t.getLocationArea()||null!=t.getLocationCity()||null!=t.getPostalAddress()) {
 			OrganizationIdentity org=new OrganizationIdentity();
@@ -946,7 +946,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		TOrderNew tNew = new TOrderNew();
 		tNew.setProjectStatus(task.getProjectStatus());
 		tNew.setOrderNo(task.getOrderNo());
-		tOrderNewMapper.updateByPrimaryKeySelective(tNew);
+		tOrderNewMapper.update(tNew);
 		}
 		if (task.getProjectStatus()==NewProjectStatus.YTJ.getCode()||task.getProjectStatus()==NewProjectStatus.YLX.getCode()||
 				task.getProjectStatus()==NewProjectStatus.YNGS.getCode()) {
@@ -1791,7 +1791,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		} else if(x==counts) {
 			n.setProcessStatus(ProcessStatus.YQBFPZXSGLY.getCode());
 		}
-		tOrderNewMapper.updateByPrimaryKeySelective(n);
+		tOrderNewMapper.update(n);
 	}
 
 	/**

+ 1 - 1
src/main/java/com/goafanti/order/service/impl/OrderReceivablesServiceImpl.java

@@ -204,7 +204,7 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 			//这里的已收金额是以前收的所有金额加上本次收的金额
 			orderNew.setSettlementAmount(count);
 			orderNew.setLiquidationStatus(lstaus);
-			tOrderNewMapper.updateByPrimaryKeySelective(orderNew);
+			tOrderNewMapper.update(orderNew);
 			//如果达到奖金发放要求新增奖金信息
 			if(null != bonus.getBonusSubject()){
 					bonus.setId(UUID.randomUUID().toString());

+ 17 - 35
src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java

@@ -1,58 +1,40 @@
 package com.goafanti.order.service.impl;
 
-import java.lang.reflect.InvocationTargetException;
-import java.math.BigDecimal;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-import com.alibaba.fastjson.JSONArray;
-import com.goafanti.common.dao.*;
-import com.goafanti.common.model.*;
-import com.goafanti.order.enums.*;
-import com.google.gson.JsonArray;
-import org.apache.commons.beanutils.BeanUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.goafanti.common.bo.Error;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
+import com.goafanti.common.dao.*;
 import com.goafanti.common.enums.DeleteStatus;
-import com.goafanti.common.enums.NoticeReadStatus;
-import com.goafanti.common.enums.NoticeStatus;
-import com.goafanti.common.enums.OrderFlowState;
 import com.goafanti.common.enums.UserLockReleaseStatus;
 import com.goafanti.common.error.BusinessException;
+import com.goafanti.common.model.*;
 import com.goafanti.common.utils.AsyncUtils;
 import com.goafanti.common.utils.BeanUtilsExt;
 import com.goafanti.common.utils.DateUtils;
-import com.goafanti.common.utils.MobileMessageUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
-import com.goafanti.core.mybatis.JDBCIdGenerator;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.customer.bo.BusinessListBo;
 import com.goafanti.customer.bo.FollowBusinessBo;
 import com.goafanti.customer.bo.LockingReleaseBo;
-import com.goafanti.order.bo.BillDetailBo;
 import com.goafanti.order.bo.BillListBo;
-import com.goafanti.order.bo.CommodityDetailBo;
 import com.goafanti.order.bo.OperatorActive;
 import com.goafanti.order.bo.OrderChangeBo;
 import com.goafanti.order.bo.OrderListBo;
-import com.goafanti.order.bo.ServiceOrderDetailBo;
-import com.goafanti.order.bo.C2BOrderDetailBo;
-import com.goafanti.order.bo.C2COrderDetailBo;
-
+import com.goafanti.order.enums.*;
 import com.goafanti.order.service.OrderService;
-import com.goafanti.techproject.enums.TaskState;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.lang.reflect.InvocationTargetException;
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements OrderService {
@@ -1156,7 +1138,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		}else {
 			return 0;
 		}
-		return tOrderNewMapper.updateByPrimaryKeySelective(newOrder);
+		return tOrderNewMapper.update(newOrder);
 	}
 
 
@@ -1212,7 +1194,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		}else {
 			return 0;
 		}
-		return tOrderNewMapper.updateByPrimaryKeySelective(newOrder);
+		return tOrderNewMapper.update(newOrder);
 	}
 
 

+ 1 - 1
src/main/java/com/goafanti/order/service/impl/OutsourceOrgServiceImpl.java

@@ -131,7 +131,7 @@ public class OutsourceOrgServiceImpl  extends BaseMybatisDao<TOrderOutsourceMapp
 				aids.addAll(adminMapper.listNameByDepAndName(adminMapper.getDeptNameByAid(t2.getSalesmanId()).getDepartmentId(), AFTConstants.SALESMAN_ADMIN));
 				type=NoticeStatus.ORDER_OUTSOURCE_NO.getCode();
 			}
-			tOrderNewMapper.updateByPrimaryKeySelective(t);
+			tOrderNewMapper.update(t);
 		}else if (o.getType()==1) {//项目外包
 			TOrderTask tt=tOrderTaskMapper.queryById(o.getTid());
 			aids.add(tt.getTaskReceiver());

+ 1 - 1
src/main/java/com/goafanti/order/service/impl/TaskScoreServiceImpl.java

@@ -71,7 +71,7 @@ public class TaskScoreServiceImpl extends BaseMybatisDao<TaskScoreMapper> implem
 
 
         }
-        tOrderNewMapper.updateByPrimaryKeySelective(tOrderNew);
+        tOrderNewMapper.update(tOrderNew);
         return taskScore;
     }
 

+ 5 - 5
src/main/java/com/goafanti/organization/service/impl/OrganizationServiceImpl.java

@@ -392,7 +392,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 					}
 				}
 				newOrder.setExamineName(str.substring(0,str.length()-1));
-				torderNewMapper.updateByPrimaryKeySelective(newOrder);
+				tOrderNewMapper.update(newOrder);
 			}
 		} else if (Objects.equals(useDep.getOperationGuaranteeId(),in.getOperationGuaranteeId())) {
 			List<String> strings = torderNewMapper.selectByDepAndProcess(useDep.getId(), ProcessStatus.YYBZSH.getCode());
@@ -401,7 +401,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 				TOrderNew newOrder = new TOrderNew();
 				newOrder.setOrderNo(s);
 				newOrder.setExamineName(admin.getName());
-				torderNewMapper.updateByPrimaryKeySelective(newOrder);
+				tOrderNewMapper.update(newOrder);
 			}
 		}
 		//关掉特批审核
@@ -420,7 +420,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 					newOrder.setOrderNo(s);
 					newOrder.setApproval(ApprovalNewState.TPTG.getCode());
 					newOrder.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
-					torderNewMapper.updateByPrimaryKeySelective(newOrder);
+					tOrderNewMapper.update(newOrder);
 					addOrderLog(s,OrderLogProcess.TP.getCode(),"特批审核关闭,系统自动通过");
 				}
 			}
@@ -433,7 +433,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 					TOrderNew newOrder=new TOrderNew();
 					newOrder.setOrderNo(s);
 					newOrder.setExamineName(order.getApprovalName());
-					torderNewMapper.updateByPrimaryKeySelective(newOrder);
+					tOrderNewMapper.update(newOrder);
 				}
 			}
 
@@ -539,7 +539,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 				pushJSZJidAndName(aids, str);
 			}
 			newOrder.setExamineName(str.substring(0,str.length()-1));
-			torderNewMapper.updateByPrimaryKeySelective(newOrder);
+			tOrderNewMapper.update(newOrder);
 		}
 
 	}