Просмотр исходного кода

Merge branch 'test2' of jishutao/kede-server into prod

anderx 1 год назад
Родитель
Сommit
3ab0140ea2
57 измененных файлов с 5072 добавлено и 2811 удалено
  1. 1 1
      src/main/java/com/goafanti/business/controller/AdminBusinessProjectController.java
  2. 1 2
      src/main/java/com/goafanti/business/service/impl/BusinessProjectServiceImpl.java
  3. 86 0
      src/main/java/com/goafanti/common/dao/AdminProjectStatisticsMapper.java
  4. 74 13
      src/main/java/com/goafanti/common/dao/TOrderNewMapper.java
  5. 5 1
      src/main/java/com/goafanti/common/dao/TOrderTaskMapper.java
  6. 90 0
      src/main/java/com/goafanti/common/dao/TaskScoreMapper.java
  7. 215 0
      src/main/java/com/goafanti/common/mapper/AdminProjectStatisticsMapper.xml
  8. 2575 2199
      src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml
  9. 79 17
      src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml
  10. 258 0
      src/main/java/com/goafanti/common/mapper/TaskScoreMapper.xml
  11. 26 3
      src/main/java/com/goafanti/common/mapper/UserArchivesMapper.xml
  12. 150 0
      src/main/java/com/goafanti/common/model/AdminProjectStatistics.java
  13. 21 345
      src/main/java/com/goafanti/common/model/TOrderNew.java
  14. 27 6
      src/main/java/com/goafanti/common/model/TOrderTask.java
  15. 153 0
      src/main/java/com/goafanti/common/model/TaskScore.java
  16. 1 1
      src/main/java/com/goafanti/common/task/OrderDunTask.java
  17. 20 3
      src/main/java/com/goafanti/common/utils/BeanUtilsExt.java
  18. 13 2
      src/main/java/com/goafanti/core/mybatis/BaseMybatisDao.java
  19. 27 0
      src/main/java/com/goafanti/customer/bo/InputSelectUserArchives.java
  20. 54 9
      src/main/java/com/goafanti/customer/bo/OutSelectUserArchives.java
  21. 9 0
      src/main/java/com/goafanti/customer/controller/UserArchivesController.java
  22. 2 0
      src/main/java/com/goafanti/customer/service/UserArchivesService.java
  23. 1 1
      src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java
  24. 33 2
      src/main/java/com/goafanti/customer/service/impl/UserArchivesServiceImpl.java
  25. 9 0
      src/main/java/com/goafanti/order/bo/InputOrderNewListBo.java
  26. 43 0
      src/main/java/com/goafanti/order/bo/OutProjectStatistics.java
  27. 11 0
      src/main/java/com/goafanti/order/bo/TOrderNewBo.java
  28. 6 3
      src/main/java/com/goafanti/order/bo/TOrderTaskBo.java
  29. 18 0
      src/main/java/com/goafanti/order/bo/TOrderTaskListBo.java
  30. 87 0
      src/main/java/com/goafanti/order/bo/TaskScore/InputTaskScore.java
  31. 209 0
      src/main/java/com/goafanti/order/bo/TaskScore/OutAdminTaskScore.java
  32. 25 0
      src/main/java/com/goafanti/order/bo/outStatistics/OutProjectStatisticsAudit.java
  33. 25 0
      src/main/java/com/goafanti/order/bo/outStatistics/OutProjectStatisticsCommon.java
  34. 25 0
      src/main/java/com/goafanti/order/bo/outStatistics/OutProjectStatisticsDoubleSoft.java
  35. 25 0
      src/main/java/com/goafanti/order/bo/outStatistics/OutProjectStatisticsHighTech.java
  36. 25 0
      src/main/java/com/goafanti/order/bo/outStatistics/OutProjectStatisticsMember.java
  37. 25 0
      src/main/java/com/goafanti/order/bo/outStatistics/OutProjectStatisticsPatent.java
  38. 25 0
      src/main/java/com/goafanti/order/bo/outStatistics/OutProjectStatisticsSoftwareWorks.java
  39. 1 1
      src/main/java/com/goafanti/order/controller/OrderProjectApiController.java
  40. 123 0
      src/main/java/com/goafanti/order/controller/TaskScoreController.java
  41. 65 0
      src/main/java/com/goafanti/order/service/TaskScoreService.java
  42. 11 11
      src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java
  43. 7 12
      src/main/java/com/goafanti/order/service/impl/OrderBillServiceImpl.java
  44. 6 13
      src/main/java/com/goafanti/order/service/impl/OrderBonusServiceImpl.java
  45. 12 12
      src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java
  46. 4 4
      src/main/java/com/goafanti/order/service/impl/OrderInvoiceServiceImpl.java
  47. 22 21
      src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java
  48. 57 26
      src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java
  49. 1 1
      src/main/java/com/goafanti/order/service/impl/OrderReceivablesServiceImpl.java
  50. 19 37
      src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java
  51. 2 2
      src/main/java/com/goafanti/order/service/impl/OutsourceOrgServiceImpl.java
  52. 247 0
      src/main/java/com/goafanti/order/service/impl/TaskScoreServiceImpl.java
  53. 9 9
      src/main/java/com/goafanti/organization/service/impl/OrganizationServiceImpl.java
  54. 4 4
      src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java
  55. 2 2
      src/main/resources/props/config_local.properties
  56. 1 1
      src/main/resources/props/config_test.properties
  57. 0 47
      src/main/webapp/WEB-INF/views/common.html

+ 1 - 1
src/main/java/com/goafanti/business/controller/AdminBusinessProjectController.java

@@ -45,7 +45,7 @@ public class AdminBusinessProjectController extends CertifyApiController{
 			res.getError().add(buildError(ErrorConstants.PARAM_BEING_ERROR, "项目名称已存在", "项目名称"));
 			return res;
 		}
-		if(Integer.valueOf(country)==0){
+		if(Integer.parseInt(country)==0){
 			if (StringUtils.isBlank(province)) {
 				res.getError().add(buildError( "至少指定省", "至少指定省"));
 				return res;

+ 1 - 2
src/main/java/com/goafanti/business/service/impl/BusinessProjectServiceImpl.java

@@ -43,7 +43,7 @@ public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMa
 		bp.setCid(cid);
 		bp.setCountry(country);
 		bp.setType(0);
-		if (1!=Integer.valueOf(country)) {
+		if (1!=Integer.parseInt(country)) {
 			bp.setProvince(province);
 			bp.setCity(city);
 			bp.setDistrict(district);
@@ -59,7 +59,6 @@ public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMa
 		bp.setFirstPayment(new BigDecimal("0"));
 		return businessProjectMapper.insertSelective(bp);
 	}
-	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<BusinessProjectBo> listProject(String bname, String cid, String country,String province,String city,String district, String activityFlag,
 			String status,Integer type,Integer restrictStatus, Integer pNo, Integer pSize) {

+ 86 - 0
src/main/java/com/goafanti/common/dao/AdminProjectStatisticsMapper.java

@@ -0,0 +1,86 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.AdminProjectStatistics;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.data.domain.Pageable;
+
+import java.util.List;
+
+/**
+ * 管理员用户项目评分表(AdminProjectStatistics)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-10-14 16:42:08
+ */
+public interface AdminProjectStatisticsMapper {
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    AdminProjectStatistics queryById(Integer id);
+
+
+    /**
+     * 查询指定行数据
+     *
+     * @param adminProjectStatistics 查询条件
+     * @param pageable               分页对象
+     * @return 对象列表
+     */
+    List<AdminProjectStatistics> findAdminProjectStatisticsList(AdminProjectStatistics adminProjectStatistics, @Param("pageable") Pageable pageable);
+
+    /**
+     * 统计总行数
+     *
+     * @param adminProjectStatistics 查询条件
+     * @return 总行数
+     */
+    int findAdminProjectStatisticsCount(AdminProjectStatistics adminProjectStatistics);
+
+    /**
+     * 新增数据
+     *
+     * @param adminProjectStatistics 实例对象
+     * @return 影响行数
+     */
+    int insert(AdminProjectStatistics adminProjectStatistics);
+
+    /**
+     * 批量新增数据(MyBatis原生foreach方法)
+     *
+     * @param entities List<AdminProjectStatistics> 实例对象列表
+     * @return 影响行数
+     */
+    int insertBatch(@Param("entities") List<AdminProjectStatistics> entities);
+
+    /**
+     * 批量新增或按主键更新数据(MyBatis原生foreach方法)
+     *
+     * @param entities List<AdminProjectStatistics> 实例对象列表
+     * @return 影响行数
+     * @throws org.springframework.jdbc.BadSqlGrammarException 入参是空List的时候会抛SQL语句错误的异常,请自行校验入参
+     */
+    int insertOrUpdateBatch(@Param("entities") List<AdminProjectStatistics> entities);
+
+    /**
+     * 修改数据
+     *
+     * @param adminProjectStatistics 实例对象
+     * @return 影响行数
+     */
+    int update(AdminProjectStatistics adminProjectStatistics);
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 影响行数
+     */
+    int deleteById(Integer id);
+
+    AdminProjectStatistics queryByAid(String aid);
+}
+

+ 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);
 
 }
+

+ 5 - 1
src/main/java/com/goafanti/common/dao/TOrderTaskMapper.java

@@ -16,7 +16,7 @@ import java.util.List;
  * 订单任务表(TOrderTask)表数据库访问层
  *
  * @author makejava
- * @since 2024-09-11 16:02:02
+ * @since 2024-09-27 15:05:35
  */
 public interface TOrderTaskMapper {
 
@@ -159,5 +159,9 @@ public interface TOrderTaskMapper {
 
 
     List<TOrderTask> selectAll();
+
+    List<TOrderTask> selectTasksByTid(Integer tid);
+
+    List<TOrderTaskBo> selectAdminTaskByTid(Integer tid);
 }
 

+ 90 - 0
src/main/java/com/goafanti/common/dao/TaskScoreMapper.java

@@ -0,0 +1,90 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.TaskScore;
+import com.goafanti.order.bo.TaskScore.InputTaskScore;
+import com.goafanti.order.bo.TaskScore.OutAdminTaskScore;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.data.domain.Pageable;
+
+import java.util.List;
+
+/**
+ * 项目评分列表(TaskScore)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-10-15 10:49:43
+ */
+public interface TaskScoreMapper {
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    TaskScore queryById(Integer id);
+
+
+    /**
+     * 查询指定行数据
+     *
+     * @param taskScore 查询条件
+     * @param pageable  分页对象
+     * @return 对象列表
+     */
+    List<TaskScore> findTaskScoreList(TaskScore taskScore, @Param("pageable") Pageable pageable);
+
+    /**
+     * 统计总行数
+     *
+     * @param taskScore 查询条件
+     * @return 总行数
+     */
+    int findTaskScoreCount(TaskScore taskScore);
+
+    /**
+     * 新增数据
+     *
+     * @param taskScore 实例对象
+     * @return 影响行数
+     */
+    int insert(TaskScore taskScore);
+
+    /**
+     * 批量新增数据(MyBatis原生foreach方法)
+     *
+     * @param entities List<TaskScore> 实例对象列表
+     * @return 影响行数
+     */
+    int insertBatch(@Param("entities") List<TaskScore> entities);
+
+    /**
+     * 批量新增或按主键更新数据(MyBatis原生foreach方法)
+     *
+     * @param entities List<TaskScore> 实例对象列表
+     * @return 影响行数
+     * @throws org.springframework.jdbc.BadSqlGrammarException 入参是空List的时候会抛SQL语句错误的异常,请自行校验入参
+     */
+    int insertOrUpdateBatch(@Param("entities") List<TaskScore> entities);
+
+    /**
+     * 修改数据
+     *
+     * @param taskScore 实例对象
+     * @return 影响行数
+     */
+    int update(TaskScore taskScore);
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 影响行数
+     */
+    int deleteById(Integer id);
+
+    TaskScore queryByTid(Integer tid);
+
+    List<OutAdminTaskScore> findAdminTaskScoreList(InputTaskScore in);
+}
+

+ 215 - 0
src/main/java/com/goafanti/common/mapper/AdminProjectStatisticsMapper.xml

@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.goafanti.common.dao.AdminProjectStatisticsMapper">
+
+    <resultMap type="com.goafanti.common.model.AdminProjectStatistics" id="AdminProjectStatisticsMap">
+        <result property="id" column="id" jdbcType="INTEGER"/>
+        <result property="aid" column="aid" jdbcType="VARCHAR"/>
+        <result property="htSatCount" column="ht_sat_count" jdbcType="INTEGER"/>
+        <result property="htSatNotScoreCount" column="ht_sat_not_score_count" jdbcType="INTEGER"/>
+        <result property="htSatScoreCount" column="ht_sat_score_count" jdbcType="INTEGER"/>
+        <result property="htSatScoreAverage" column="ht_sat_score_average" jdbcType="NUMERIC"/>
+        <result property="memberCount" column="member_count" jdbcType="INTEGER"/>
+        <result property="memberNotScoreCount" column="member_not_score_count" jdbcType="INTEGER"/>
+        <result property="memberScoreCount" column="member_score_count" jdbcType="INTEGER"/>
+        <result property="memberScoreAverage" column="member_score_average" jdbcType="NUMERIC"/>
+        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+    <sql id="AdminProjectStatisticsAllSql">
+        id, aid, ht_sat_count, ht_sat_not_score_count, ht_sat_score_count, ht_sat_score_average, member_count, member_not_score_count, member_score_count, member_score_average, create_time
+    </sql>
+
+    <!--查询单个-->
+    <select id="queryById" resultMap="AdminProjectStatisticsMap">
+        select
+        <include refid="AdminProjectStatisticsAllSql"/>
+        from admin_project_statistics
+        where id = #{id}
+    </select>
+
+    <!--查询指定行数据-->
+    <select id="findAdminProjectStatisticsList" resultMap="AdminProjectStatisticsMap">
+        select
+        <include refid="AdminProjectStatisticsAllSql"/>
+
+        from admin_project_statistics
+        <where>
+            <if test="id != null">
+                and id = #{id}
+            </if>
+            <if test="aid != null and aid != ''">
+                and aid = #{aid}
+            </if>
+            <if test="htSatCount != null">
+                and ht_sat_count = #{htSatCount}
+            </if>
+            <if test="htSatNotScoreCount != null">
+                and ht_sat_not_score_count = #{htSatNotScoreCount}
+            </if>
+            <if test="htSatScoreCount != null">
+                and ht_sat_score_count = #{htSatScoreCount}
+            </if>
+            <if test="htSatScoreAverage != null">
+                and ht_sat_score_average = #{htSatScoreAverage}
+            </if>
+            <if test="memberCount != null">
+                and member_count = #{memberCount}
+            </if>
+            <if test="memberNotScoreCount != null">
+                and member_not_score_count = #{memberNotScoreCount}
+            </if>
+            <if test="memberScoreCount != null">
+                and member_score_count = #{memberScoreCount}
+            </if>
+            <if test="memberScoreAverage != null">
+                and member_score_average = #{memberScoreAverage}
+            </if>
+            <if test="createTime != null">
+                and create_time = #{createTime}
+            </if>
+        </where>
+        <if test="page_sql != null">
+            ${page_sql}
+        </if>
+    </select>
+
+    <!--统计总行数-->
+    <select id="findAdminProjectStatisticsCount" resultType="java.lang.Integer">
+        select count(1)
+        from admin_project_statistics
+        <where>
+            <if test="id != null">
+                and id = #{id}
+            </if>
+            <if test="aid != null and aid != ''">
+                and aid = #{aid}
+            </if>
+            <if test="htSatCount != null">
+                and ht_sat_count = #{htSatCount}
+            </if>
+            <if test="htSatNotScoreCount != null">
+                and ht_sat_not_score_count = #{htSatNotScoreCount}
+            </if>
+            <if test="htSatScoreCount != null">
+                and ht_sat_score_count = #{htSatScoreCount}
+            </if>
+            <if test="htSatScoreAverage != null">
+                and ht_sat_score_average = #{htSatScoreAverage}
+            </if>
+            <if test="memberCount != null">
+                and member_count = #{memberCount}
+            </if>
+            <if test="memberNotScoreCount != null">
+                and member_not_score_count = #{memberNotScoreCount}
+            </if>
+            <if test="memberScoreCount != null">
+                and member_score_count = #{memberScoreCount}
+            </if>
+            <if test="memberScoreAverage != null">
+                and member_score_average = #{memberScoreAverage}
+            </if>
+            <if test="createTime != null">
+                and create_time = #{createTime}
+            </if>
+        </where>
+    </select>
+
+    <!--新增所有列-->
+    <insert id="insert" keyProperty="id" useGeneratedKeys="true">
+        insert into admin_project_statistics(aid, ht_sat_count, ht_sat_not_score_count, ht_sat_score_count,
+                                             ht_sat_score_average, member_count, member_not_score_count,
+                                             member_score_count, member_score_average, create_time)
+        values (#{aid}, #{htSatCount}, #{htSatNotScoreCount}, #{htSatScoreCount}, #{htSatScoreAverage}, #{memberCount},
+                #{memberNotScoreCount}, #{memberScoreCount}, #{memberScoreAverage}, #{createTime})
+    </insert>
+
+    <insert id="insertBatch">
+        insert into admin_project_statistics(aid, ht_sat_count, ht_sat_not_score_count, ht_sat_score_count,
+        ht_sat_score_average, member_count, member_not_score_count, member_score_count, member_score_average,
+        create_time)
+        values
+        <foreach collection="entities" item="entity" separator=",">
+            (#{entity.aid}, #{entity.htSatCount}, #{entity.htSatNotScoreCount}, #{entity.htSatScoreCount},
+            #{entity.htSatScoreAverage}, #{entity.memberCount}, #{entity.memberNotScoreCount},
+            #{entity.memberScoreCount}, #{entity.memberScoreAverage}, #{entity.createTime})
+        </foreach>
+    </insert>
+
+    <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
+        insert into admin_project_statistics(aid, ht_sat_count, ht_sat_not_score_count, ht_sat_score_count,
+        ht_sat_score_average, member_count, member_not_score_count, member_score_count, member_score_average,
+        create_time)
+        values
+        <foreach collection="entities" item="entity" separator=",">
+            (#{entity.aid}, #{entity.htSatCount}, #{entity.htSatNotScoreCount}, #{entity.htSatScoreCount},
+            #{entity.htSatScoreAverage}, #{entity.memberCount}, #{entity.memberNotScoreCount},
+            #{entity.memberScoreCount}, #{entity.memberScoreAverage}, #{entity.createTime})
+        </foreach>
+        on duplicate key update
+        aid = values(aid),
+        ht_sat_count = values(ht_sat_count),
+        ht_sat_not_score_count = values(ht_sat_not_score_count),
+        ht_sat_score_count = values(ht_sat_score_count),
+        ht_sat_score_average = values(ht_sat_score_average),
+        member_count = values(member_count),
+        member_not_score_count = values(member_not_score_count),
+        member_score_count = values(member_score_count),
+        member_score_average = values(member_score_average),
+        create_time = values(create_time)
+    </insert>
+
+    <!--通过主键修改数据-->
+    <update id="update">
+        update admin_project_statistics
+        <set>
+            <if test="aid != null and aid != ''">
+                aid = #{aid},
+            </if>
+            <if test="htSatCount != null">
+                ht_sat_count = #{htSatCount},
+            </if>
+            <if test="htSatNotScoreCount != null">
+                ht_sat_not_score_count = #{htSatNotScoreCount},
+            </if>
+            <if test="htSatScoreCount != null">
+                ht_sat_score_count = #{htSatScoreCount},
+            </if>
+            <if test="htSatScoreAverage != null">
+                ht_sat_score_average = #{htSatScoreAverage},
+            </if>
+            <if test="memberCount != null">
+                member_count = #{memberCount},
+            </if>
+            <if test="memberNotScoreCount != null">
+                member_not_score_count = #{memberNotScoreCount},
+            </if>
+            <if test="memberScoreCount != null">
+                member_score_count = #{memberScoreCount},
+            </if>
+            <if test="memberScoreAverage != null">
+                member_score_average = #{memberScoreAverage},
+            </if>
+            <if test="createTime != null">
+                create_time = #{createTime},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <!--通过主键删除-->
+    <delete id="deleteById">
+        delete
+        from admin_project_statistics
+        where id = #{id}
+    </delete>
+
+    <select id="queryByAid"  resultMap="AdminProjectStatisticsMap">
+        select
+        <include refid="AdminProjectStatisticsAllSql"/>
+        from admin_project_statistics
+        where aid = #{aid}
+    </select>
+
+</mapper>
+

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


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


+ 258 - 0
src/main/java/com/goafanti/common/mapper/TaskScoreMapper.xml

@@ -0,0 +1,258 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.goafanti.common.dao.TaskScoreMapper">
+
+    <resultMap type="com.goafanti.common.model.TaskScore" id="TaskScoreMap">
+        <result property="id" column="id" jdbcType="INTEGER"/>
+        <result property="tid" column="tid" jdbcType="INTEGER"/>
+        <result property="professionalism" column="professionalism" jdbcType="INTEGER"/>
+        <result property="communicationSkills" column="communication_skills" jdbcType="INTEGER"/>
+        <result property="responsiveness" column="responsiveness" jdbcType="INTEGER"/>
+        <result property="publicImage" column="public_image" jdbcType="INTEGER"/>
+        <result property="serviceAttitude" column="service_attitude" jdbcType="INTEGER"/>
+        <result property="monthlyReport" column="monthly_report" jdbcType="INTEGER"/>
+        <result property="yearReport" column="year_report" jdbcType="INTEGER"/>
+        <result property="remarks" column="remarks" jdbcType="VARCHAR"/>
+        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+    <sql id="TaskScoreAllSql">
+        id, tid, professionalism, communication_skills, responsiveness, public_image, service_attitude, monthly_report, year_report, remarks, create_time
+    </sql>
+
+    <!--查询单个-->
+    <select id="queryById" resultMap="TaskScoreMap">
+        select
+        <include refid="TaskScoreAllSql"/>
+        from task_score
+        where id = #{id}
+    </select>
+
+    <!--查询指定行数据-->
+    <select id="findTaskScoreList" resultMap="TaskScoreMap">
+        select
+        <include refid="TaskScoreAllSql"/>
+
+        from task_score
+        <where>
+            <if test="id != null">
+                and id = #{id}
+            </if>
+            <if test="tid != null">
+                and tid = #{tid}
+            </if>
+            <if test="professionalism != null">
+                and professionalism = #{professionalism}
+            </if>
+            <if test="communicationSkills != null">
+                and communication_skills = #{communicationSkills}
+            </if>
+            <if test="responsiveness != null">
+                and responsiveness = #{responsiveness}
+            </if>
+            <if test="publicImage != null">
+                and public_image = #{publicImage}
+            </if>
+            <if test="serviceAttitude != null">
+                and service_attitude = #{serviceAttitude}
+            </if>
+            <if test="monthlyReport != null">
+                and monthly_report = #{monthlyReport}
+            </if>
+            <if test="yearReport != null">
+                and year_report = #{yearReport}
+            </if>
+            <if test="remarks != null and remarks != ''">
+                and remarks = #{remarks}
+            </if>
+            <if test="createTime != null">
+                and create_time = #{createTime}
+            </if>
+        </where>
+        <if test="page_sql != null">
+            ${page_sql}
+        </if>
+    </select>
+
+    <!--统计总行数-->
+    <select id="findTaskScoreCount" resultType="java.lang.Integer">
+        select count(1)
+        from task_score
+        <where>
+            <if test="id != null">
+                and id = #{id}
+            </if>
+            <if test="tid != null">
+                and tid = #{tid}
+            </if>
+            <if test="professionalism != null">
+                and professionalism = #{professionalism}
+            </if>
+            <if test="communicationSkills != null">
+                and communication_skills = #{communicationSkills}
+            </if>
+            <if test="responsiveness != null">
+                and responsiveness = #{responsiveness}
+            </if>
+            <if test="publicImage != null">
+                and public_image = #{publicImage}
+            </if>
+            <if test="serviceAttitude != null">
+                and service_attitude = #{serviceAttitude}
+            </if>
+            <if test="monthlyReport != null">
+                and monthly_report = #{monthlyReport}
+            </if>
+            <if test="yearReport != null">
+                and year_report = #{yearReport}
+            </if>
+            <if test="remarks != null and remarks != ''">
+                and remarks = #{remarks}
+            </if>
+            <if test="createTime != null">
+                and create_time = #{createTime}
+            </if>
+        </where>
+    </select>
+
+    <!--新增所有列-->
+    <insert id="insert" keyProperty="id" useGeneratedKeys="true">
+        insert into task_score(tid, professionalism, communication_skills, responsiveness, public_image,
+                               service_attitude, monthly_report, year_report, remarks, create_time)
+        values (#{tid}, #{professionalism}, #{communicationSkills}, #{responsiveness}, #{publicImage},
+                #{serviceAttitude}, #{monthlyReport}, #{yearReport}, #{remarks}, now())
+    </insert>
+
+    <insert id="insertBatch">
+        insert into task_score(tid, professionalism, communication_skills, responsiveness, public_image,
+        service_attitude, monthly_report, year_report, remarks, create_time)
+        values
+        <foreach collection="entities" item="entity" separator=",">
+            (#{entity.tid}, #{entity.professionalism}, #{entity.communicationSkills}, #{entity.responsiveness},
+            #{entity.publicImage}, #{entity.serviceAttitude}, #{entity.monthlyReport}, #{entity.yearReport},
+            #{entity.remarks}, #{entity.createTime})
+        </foreach>
+    </insert>
+
+    <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
+        insert into task_score(tid, professionalism, communication_skills, responsiveness, public_image,
+        service_attitude, monthly_report, year_report, remarks, create_time)
+        values
+        <foreach collection="entities" item="entity" separator=",">
+            (#{entity.tid}, #{entity.professionalism}, #{entity.communicationSkills}, #{entity.responsiveness},
+            #{entity.publicImage}, #{entity.serviceAttitude}, #{entity.monthlyReport}, #{entity.yearReport},
+            #{entity.remarks}, #{entity.createTime})
+        </foreach>
+        on duplicate key update
+        tid = values(tid),
+        professionalism = values(professionalism),
+        communication_skills = values(communication_skills),
+        responsiveness = values(responsiveness),
+        public_image = values(public_image),
+        service_attitude = values(service_attitude),
+        monthly_report = values(monthly_report),
+        year_report = values(year_report),
+        remarks = values(remarks),
+        create_time = values(create_time)
+    </insert>
+
+    <!--通过主键修改数据-->
+    <update id="update">
+        update task_score
+        <set>
+            <if test="tid != null">
+                tid = #{tid},
+            </if>
+            <if test="professionalism != null">
+                professionalism = #{professionalism},
+            </if>
+            <if test="communicationSkills != null">
+                communication_skills = #{communicationSkills},
+            </if>
+            <if test="responsiveness != null">
+                responsiveness = #{responsiveness},
+            </if>
+            <if test="publicImage != null">
+                public_image = #{publicImage},
+            </if>
+            <if test="serviceAttitude != null">
+                service_attitude = #{serviceAttitude},
+            </if>
+            <if test="monthlyReport != null">
+                monthly_report = #{monthlyReport},
+            </if>
+            <if test="yearReport != null">
+                year_report = #{yearReport},
+            </if>
+            <if test="remarks != null and remarks != ''">
+                remarks = #{remarks},
+            </if>
+            <if test="createTime != null">
+                create_time = #{createTime},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <!--通过主键删除-->
+    <delete id="deleteById">
+        delete
+        from task_score
+        where id = #{id}
+    </delete>
+
+
+    <select id="findAdminTaskScoreList" resultType="com.goafanti.order.bo.TaskScore.OutAdminTaskScore">
+        select a.id,a.name ,a.department_id depId,c.name depName,a.superior_id superId,a2.name superName,a.status ,a.last_login_time  lastLoginTime,
+        b.ht_sat_count  htSatCount,b.ht_sat_not_score_count htSatNotScoreCount,b.ht_sat_score_count htSatScoreCount,b.ht_sat_score_average htSatScoreAverage,
+        b.member_count memberCount,b.member_not_score_count memberNotScoreCount,b.member_score_count memberScoreCount,b.member_score_average memberScoreAverage
+        from admin a left join admin_project_statistics b on a.id =b.aid
+        left join department c on a.department_id =c.id
+        left join admin a2 on a.superior_id =a2.id
+        <if test="roleId !=null">
+            left join user_role ur on a.id=ur.uid left join role r on ur.rid=r.id
+        </if>
+        <include refid="findAdminTaskScoreSql"/>
+        <if test="page_sql != null">
+            ${page_sql}
+        </if>
+    </select>
+    <sql id="findAdminTaskScoreSql">
+        <where>
+            <if test="name != null">
+                and a.name like concat('%',#{name},'%')
+            </if>
+            <if test="depId != null">
+                and a.department_id =#{depId}
+            </if>
+            <if test="roleId != null">
+                and r.id =#{roleId}
+            </if>
+            <if test="position != null">
+                and a.position =#{position}
+            </if>
+            <if test="status != null">
+                and a.status = #{status}
+            </if>
+        </where>
+    </sql>
+
+    <!--统计总行数-->
+    <select id="findAdminTaskScoreCount" resultType="java.lang.Integer">
+        select count(*)
+        from admin a
+        <if test="roleId !=null">
+            left join user_role ur on a.id=ur.uid left join role r on ur.rid=r.id
+        </if>
+        <include refid="findAdminTaskScoreSql"/>
+    </select>
+
+    <select id="queryByTid"  resultMap="TaskScoreMap">
+        select
+        <include refid="TaskScoreAllSql"/>
+        from task_score
+        where tid = #{tid}
+    </select>
+
+</mapper>
+

+ 26 - 3
src/main/java/com/goafanti/common/mapper/UserArchivesMapper.xml

@@ -243,7 +243,7 @@ interview_distribution = values(interview_distribution)
     </select>
 
     <select id="selectUserArchivesList" resultType="com.goafanti.customer.bo.OutSelectUserArchives">
-        select a.id , a.nickname ,d1.name as  province ,d2.name as  city ,d3.name area ,
+        select a.id , a.nickname ,d1.name as  province ,d2.name as  city ,d3.name area ,a.sign_bills signBills,
         a.share_type as shareType ,d.channel_type as channelType ,e.enterprise_count as enterpriseCount,
         c.name contactName,f.name adminName,e.channel_indicators as channelIndicators,
         e.interview_ideas as interviewIdeas ,b.intended_project as intendedProject,
@@ -280,7 +280,15 @@ interview_distribution = values(interview_distribution)
             </foreach>
             </if>
             <if test="shareType !=null">
-                and a.share_type = #{shareType}
+                <if test="shareType &lt; 4">
+                    and a.share_type = #{shareType}
+                </if>
+                <if test="shareType == 4">
+                    and a.share_type in (0,2)
+                </if>
+            </if>
+            <if test="signBills !=null">
+                and a.sign_bills = #{signBills}
             </if>
             <if test="businessScope !=null">
                 and find_in_set(#{businessScope},b.business_scope)
@@ -291,6 +299,9 @@ interview_distribution = values(interview_distribution)
                 #{item}
             </foreach>
         </if>
+            <if test="startTime !=null and endTime !=null">
+                and e.update_time between #{startTime} and #{endTime}
+            </if>
         </where>
         <if test="page_sql != null">
             ${page_sql}
@@ -301,6 +312,7 @@ interview_distribution = values(interview_distribution)
         from user a
         left join organization_identity b on a.id =b.uid
         left join user_mid d on a.id =d.uid
+        left join user_archives e on a.id =e.uid
         <where>
             <if test="newChannel !=null">
                 and a.new_channel = #{newChannel}
@@ -318,7 +330,15 @@ interview_distribution = values(interview_distribution)
                 </foreach>
             </if>
             <if test="shareType !=null">
-                and a.share_type = #{shareType}
+                <if test="shareType &lt; 4">
+                    and a.share_type = #{shareType}
+                </if>
+                <if test="shareType = 4">
+                    and a.share_type in (0,2)
+                </if>
+            </if>
+            <if test="signBills !=null">
+                and a.sign_bills = #{signBills}
             </if>
             <if test="businessScope !=null">
                 and find_in_set(#{businessScope},b.business_scope)
@@ -329,6 +349,9 @@ interview_distribution = values(interview_distribution)
                     #{item}
                 </foreach>
             </if>
+            <if test="startTime !=null and endTime !=null">
+                and e.update_time between #{startTime} and #{endTime}
+            </if>
         </where>
     </select>
 </mapper>

+ 150 - 0
src/main/java/com/goafanti/common/model/AdminProjectStatistics.java

@@ -0,0 +1,150 @@
+package com.goafanti.common.model;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 管理员用户项目评分表(AdminProjectStatistics)实体类
+ *
+ * @author makejava
+ * @since 2024-10-14 16:42:08
+ */
+public class AdminProjectStatistics implements Serializable {
+    private static final long serialVersionUID = 188207842687952556L;
+    /**
+     * id
+     */
+    private Integer id;
+    /**
+     * 管理员编号
+     */
+    private String aid;
+    /**
+     * 高新&科技数
+     */
+    private Integer htSatCount;
+    /**
+     * 高新&科技评分数
+     */
+    private Integer htSatNotScoreCount;
+    /**
+     * 高新&科技评分数
+     */
+    private Integer htSatScoreCount;
+    /**
+     * 高新&科技平均分
+     */
+    private Double htSatScoreAverage;
+    /**
+     * 会员数
+     */
+    private Integer memberCount;
+    /**
+     * 会员评分数
+     */
+    private Integer memberNotScoreCount;
+    /**
+     * 会员评分数
+     */
+    private Integer memberScoreCount;
+    /**
+     * 会员平均分
+     */
+    private Double memberScoreAverage;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getAid() {
+        return aid;
+    }
+
+    public void setAid(String aid) {
+        this.aid = aid;
+    }
+
+    public Integer getHtSatCount() {
+        return htSatCount;
+    }
+
+    public void setHtSatCount(Integer htSatCount) {
+        this.htSatCount = htSatCount;
+    }
+
+    public Integer getHtSatNotScoreCount() {
+        return htSatNotScoreCount;
+    }
+
+    public void setHtSatNotScoreCount(Integer htSatNotScoreCount) {
+        this.htSatNotScoreCount = htSatNotScoreCount;
+    }
+
+    public Integer getHtSatScoreCount() {
+        return htSatScoreCount;
+    }
+
+    public void setHtSatScoreCount(Integer htSatScoreCount) {
+        this.htSatScoreCount = htSatScoreCount;
+    }
+
+    public Double getHtSatScoreAverage() {
+        return htSatScoreAverage;
+    }
+
+    public void setHtSatScoreAverage(Double htSatScoreAverage) {
+        this.htSatScoreAverage = htSatScoreAverage;
+    }
+
+    public Integer getMemberCount() {
+        return memberCount;
+    }
+
+    public void setMemberCount(Integer memberCount) {
+        this.memberCount = memberCount;
+    }
+
+    public Integer getMemberNotScoreCount() {
+        return memberNotScoreCount;
+    }
+
+    public void setMemberNotScoreCount(Integer memberNotScoreCount) {
+        this.memberNotScoreCount = memberNotScoreCount;
+    }
+
+    public Integer getMemberScoreCount() {
+        return memberScoreCount;
+    }
+
+    public void setMemberScoreCount(Integer memberScoreCount) {
+        this.memberScoreCount = memberScoreCount;
+    }
+
+    public Double getMemberScoreAverage() {
+        return memberScoreAverage;
+    }
+
+    public void setMemberScoreAverage(Double memberScoreAverage) {
+        this.memberScoreAverage = memberScoreAverage;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+}
+

+ 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;
+    }
+
+}
+

+ 27 - 6
src/main/java/com/goafanti/common/model/TOrderTask.java

@@ -4,14 +4,15 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
+
 /**
  * 订单任务表(TOrderTask)实体类
  *
  * @author makejava
- * @since 2024-09-11 16:02:22
+ * @since 2024-09-27 15:05:35
  */
 public class TOrderTask implements Serializable {
-    private static final long serialVersionUID = -19599508669162603L;
+    private static final long serialVersionUID = -73520121653483895L;
     /**
      * 任务编号
      */
@@ -48,7 +49,6 @@ public class TOrderTask implements Serializable {
      * 合同商品价格
      */
     private BigDecimal commodityPrice;
-
     /**
      * 任务状态 0-未分派 ,1-已分派,2-材料已启动,3-材料已完成
      */
@@ -137,7 +137,6 @@ public class TOrderTask implements Serializable {
      * 立项金额
      */
     private BigDecimal setUpAmount;
-
     /**
      * 状态 0未到款 1已到款
      */
@@ -150,7 +149,6 @@ public class TOrderTask implements Serializable {
      * 单价
      */
     private BigDecimal outsourcePrice;
-
     /**
      * 咨询师id
      */
@@ -231,7 +229,6 @@ public class TOrderTask implements Serializable {
      * 认证费
      */
     private BigDecimal certificationFee;
-
     /**
      * 认证公司
      */
@@ -292,6 +289,14 @@ public class TOrderTask implements Serializable {
      * 完成状态 0待完成 1已完成
      */
     private Integer completeStatus;
+    /**
+     * 0=无,1=待评分,2=已评分
+     */
+    private Integer scoreStatus;
+    /**
+     * 评分
+     */
+    private Integer scoreNumber;
 
 
     public Integer getId() {
@@ -846,5 +851,21 @@ public class TOrderTask implements Serializable {
         this.completeStatus = completeStatus;
     }
 
+    public Integer getScoreStatus() {
+        return scoreStatus;
+    }
+
+    public void setScoreStatus(Integer scoreStatus) {
+        this.scoreStatus = scoreStatus;
+    }
+
+    public Integer getScoreNumber() {
+        return scoreNumber;
+    }
+
+    public void setScoreNumber(Integer scoreNumber) {
+        this.scoreNumber = scoreNumber;
+    }
+
 }
 

+ 153 - 0
src/main/java/com/goafanti/common/model/TaskScore.java

@@ -0,0 +1,153 @@
+package com.goafanti.common.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 项目评分列表(TaskScore)实体类
+ *
+ * @author makejava
+ * @since 2024-10-15 10:49:43
+ */
+public class TaskScore implements Serializable {
+    private static final long serialVersionUID = -66307246224831101L;
+    /**
+     * id
+     */
+    private Integer id;
+    /**
+     * 项目编号
+     */
+    private Integer tid;
+    /**
+     * 专业度
+     */
+    private Integer professionalism;
+    /**
+     * 沟通力
+     */
+    private Integer communicationSkills;
+    /**
+     * 响应度
+     */
+    private Integer responsiveness;
+    /**
+     * 公出形象
+     */
+    private Integer publicImage;
+    /**
+     * 服务态度
+     */
+    private Integer serviceAttitude;
+    /**
+     * 月度汇报
+     */
+    private Integer monthlyReport;
+    /**
+     * 月度汇报
+     */
+    private Integer yearReport;
+    /**
+     * 备注
+     */
+    private String remarks;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getTid() {
+        return tid;
+    }
+
+    public void setTid(Integer tid) {
+        this.tid = tid;
+    }
+
+    public Integer getProfessionalism() {
+        return professionalism;
+    }
+
+    public void setProfessionalism(Integer professionalism) {
+        this.professionalism = professionalism;
+    }
+
+    public Integer getCommunicationSkills() {
+        return communicationSkills;
+    }
+
+    public void setCommunicationSkills(Integer communicationSkills) {
+        this.communicationSkills = communicationSkills;
+    }
+
+    public Integer getResponsiveness() {
+        return responsiveness;
+    }
+
+    public void setResponsiveness(Integer responsiveness) {
+        this.responsiveness = responsiveness;
+    }
+
+    public Integer getPublicImage() {
+        return publicImage;
+    }
+
+    public void setPublicImage(Integer publicImage) {
+        this.publicImage = publicImage;
+    }
+
+    public Integer getServiceAttitude() {
+        return serviceAttitude;
+    }
+
+    public void setServiceAttitude(Integer serviceAttitude) {
+        this.serviceAttitude = serviceAttitude;
+    }
+
+    public Integer getMonthlyReport() {
+        return monthlyReport;
+    }
+
+    public void setMonthlyReport(Integer monthlyReport) {
+        this.monthlyReport = monthlyReport;
+    }
+
+    public Integer getYearReport() {
+        return yearReport;
+    }
+
+    public void setYearReport(Integer yearReport) {
+        this.yearReport = yearReport;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+}
+

+ 1 - 1
src/main/java/com/goafanti/common/task/OrderDunTask.java

@@ -382,7 +382,7 @@ public class OrderDunTask {
 	private void updateOrderDun(OutNewOrderDunBo t,Calendar now,Calendar now2) {
 		if (now.getTimeInMillis() >= now2.getTimeInMillis()) {
 			InputNewOrderDunBo o=new InputNewOrderDunBo();
-			TOrderNew orderNew=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
+			TOrderNew orderNew=tOrderNewMapper.queryById(t.getOrderNo());
 			Date date = new Date();
 			o.setId(t.getId());
 			o.setStatus(1);

+ 20 - 3
src/main/java/com/goafanti/common/utils/BeanUtilsExt.java

@@ -1,10 +1,13 @@
 package com.goafanti.common.utils;
 
-import java.lang.reflect.InvocationTargetException;
-
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.beanutils.ConvertUtils;
 
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.util.HashMap;
+import java.util.Map;
+
 public class BeanUtilsExt extends BeanUtils {
 
     private BeanUtilsExt() {
@@ -19,7 +22,21 @@ public class BeanUtilsExt extends BeanUtils {
 
     public static void copyProperties(Object target, Object source) throws InvocationTargetException,
             IllegalAccessException {
-        org.apache.commons.beanutils.BeanUtils.copyProperties(target, source);
+        BeanUtils.copyProperties(target, source);
         
     }
+
+    public static Map<String, Object> pushMap(Object in) {
+        HashMap<String, Object> map = new HashMap<>();
+        Class<?> clazz = in.getClass();
+        for (Field field :clazz.getDeclaredFields()){
+            field.setAccessible(true);
+            try {
+                if(field.get(in)!=null)map.put(field.getName(),field.get(in));
+            } catch (IllegalAccessException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        return map;
+    }
 }

+ 13 - 2
src/main/java/com/goafanti/core/mybatis/BaseMybatisDao.java

@@ -1,5 +1,6 @@
 package com.goafanti.core.mybatis;
 
+import com.goafanti.common.utils.BeanUtilsExt;
 import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.core.mybatis.page.MysqlDialect;
 import com.goafanti.core.mybatis.page.Pagination;
@@ -121,6 +122,11 @@ public class BaseMybatisDao<T> extends SqlSessionDaoSupport {
 		return page;
 	}
 
+	public List<?> findList(String sqlId, Object params, Integer pageNo, Integer pageSize) {
+		Map<String, Object> map = BeanUtilsExt.pushMap(params);
+		return findList(sqlId, map, pageNo, pageSize);
+	}
+
 	/**
 	 * 根据Sql ID 查询List,而不要查询分页的页码
 	 *
@@ -143,8 +149,7 @@ public class BaseMybatisDao<T> extends SqlSessionDaoSupport {
 		params.put("page_sql", page_sql);
 		sqlId = String.format("%s.%s", NAMESPACE, sqlId);
 
-		List<?> resultList = this.getSqlSession().selectList(sqlId, params);
-		return resultList;
+        return this.getSqlSession().selectList(sqlId, params);
 	}
 
 	/**
@@ -160,6 +165,12 @@ public class BaseMybatisDao<T> extends SqlSessionDaoSupport {
 		return findList(DEFAULT_SQL_ID, params, pageNo, pageSize);
 	}
 
+
+	public Pagination<?> findPage(String sqlId, String countId, Object params, Integer pageNo,
+								  Integer pageSize) {
+		Map<String, Object> map = BeanUtilsExt.pushMap(params);
+		return findPage(sqlId, countId, map, pageNo, pageSize);
+	}
 	/**
 	 * 分页
 	 *

+ 27 - 0
src/main/java/com/goafanti/customer/bo/InputSelectUserArchives.java

@@ -10,9 +10,36 @@ public class InputSelectUserArchives {
     private String  businessScope;
     private String  industry;
     private Integer shareType;
+    private Integer signBills;
+    private String  startTime;
+    private String  endTime;
     private Integer pageSize;
     private Integer pageNo;
 
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public Integer getSignBills() {
+        return signBills;
+    }
+
+    public void setSignBills(Integer signBills) {
+        this.signBills = signBills;
+    }
+
     public String getBusinessScope() {
         return businessScope;
     }

+ 54 - 9
src/main/java/com/goafanti/customer/bo/OutSelectUserArchives.java

@@ -1,32 +1,77 @@
 package com.goafanti.customer.bo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.goafanti.common.utils.excel.Excel;
+
+import java.util.Date;
+
 public class OutSelectUserArchives {
     private String id;
+    @Excel(name = "客户名称")
     private String nickname;
+    @Excel(name = "省",width = 8)
     private String province;
+    @Excel(name = "市",width = 8)
     private String city;
+    @Excel(name = "区",width = 8)
     private String area;
+    @Excel(name = "客户类型",readConverterExp = "0=私有客户,1=公共客户,2=签单客户,3=外联客户",width = 8)
     private Integer shareType;
+    @Excel(name = "签单标识",readConverterExp = "0=否,1=是",width = 8)
+    private Integer signBills;
+    @Excel(name = "主营产品")
+    private String businessScope;
     private Integer channelType;
     private Integer enterpriseCount;
-    private String contactName;
-    private String adminName;
     private String channelIndicators;
-    private String interviewIdeas;
-    private String intendedProject;
     private String interviewDistribution;
-    private String depName;
-
+    @Excel(name = "行业",width = 8)
     private String industry;
-    private String businessScope;
-    private String financialData;
-    private String earlyCommunication;
+    @Excel(name = "联系人")
+    private String contactName;
+    @Excel(name = "所属人")
+    private String adminName;
+    @Excel(name = "意向合作项目")
+    private String intendedProject;
+    @Excel(name = "专利数",width = 8)
     private Integer  patentCount;
+    @Excel(name = "发明专利数",width = 8)
     private Integer inventionPatentCount;
+    @Excel(name = "实用新型数",width = 8)
     private Integer utilityModelCount;
+    @Excel(name = "外观专利数",width = 8)
     private Integer appearancePatentCount;
+    @Excel(name = "软著数",width = 8)
     private Integer softwareWorksCount;
+    @Excel(name = "其他数",width = 8)
     private Integer otherCount;
+    @Excel(name = "财务数据")
+    private String financialData;
+    @Excel(name = "前期沟通")
+    private String earlyCommunication;
+    @Excel(name = "面谈思路及目的")
+    private String interviewIdeas;
+
+    @Excel(name = "所属部门")
+    private String depName;
+    @Excel(name = "修改时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    public Integer getSignBills() {
+        return signBills;
+    }
+
+    public void setSignBills(Integer signBills) {
+        this.signBills = signBills;
+    }
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
 
     public String getId() {
         return id;

+ 9 - 0
src/main/java/com/goafanti/customer/controller/UserArchivesController.java

@@ -140,6 +140,15 @@ public class UserArchivesController  extends BaseController {
         return res;
     }
 
+    /**
+     * 客户档案汇总导出
+     */
+    @GetMapping("/selectUserArchives/export")
+    public Result selectUserArchivesExport( InputSelectUserArchives in) {
+        if (in.getNewChannel()==null)in.setNewChannel(0);
+        return (Result) this.userArchivesService.selectUserArchivesExport(in);
+    }
+
 
 
 

+ 2 - 0
src/main/java/com/goafanti/customer/service/UserArchivesService.java

@@ -54,4 +54,6 @@ public interface UserArchivesService {
     boolean checkPermission(String id);
 
     Object selectUserArchives(InputSelectUserArchives in);
+
+    Object selectUserArchivesExport(InputSelectUserArchives in);
 }

+ 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);

+ 33 - 2
src/main/java/com/goafanti/customer/service/impl/UserArchivesServiceImpl.java

@@ -2,14 +2,17 @@ package com.goafanti.customer.service.impl;
 
 import com.goafanti.common.dao.*;
 import com.goafanti.common.model.*;
+import com.goafanti.common.utils.excel.NewExcelUtil;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.customer.bo.InputSelectUserArchives;
+import com.goafanti.customer.bo.OutSelectUserArchives;
 import com.goafanti.customer.bo.UserArchivesDetails;
 import com.goafanti.customer.service.CustomerService;
 import com.goafanti.customer.service.UserArchivesService;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -38,6 +41,11 @@ public class UserArchivesServiceImpl extends BaseMybatisDao< UserArchivesMapper>
     private AdminMapper adminMapper;
     @Resource
     private UserDataLogMapper userDataLogMapper;
+
+
+
+    @Value(value = "${upload.path}")
+    private final String	uploadPath			= null;
     
     
     @Override
@@ -236,6 +244,14 @@ public class UserArchivesServiceImpl extends BaseMybatisDao< UserArchivesMapper>
 
     @Override
     public Object selectUserArchives(InputSelectUserArchives in) {
+        Map<String, Object> params = getParams(in);
+        Pagination<OutSelectUserArchives> page = (Pagination<OutSelectUserArchives>) findPage("selectUserArchivesList",
+                "selectUserArchivesCount", params, in.getPageNo(), in.getPageSize());
+
+        return page;
+    }
+
+    private Map<String, Object> getParams(InputSelectUserArchives in) {
         Map<String, Object> params = new HashMap<>();
         if (in.getNewChannel() != null)params.put("newChannel", in.getNewChannel());
         if (in.getShareType() != null)params.put("shareType", in.getShareType());
@@ -250,7 +266,22 @@ public class UserArchivesServiceImpl extends BaseMybatisDao< UserArchivesMapper>
             String[] split = in.getIndustry().split(",");
             params.put("industry", split);
         }
-        return findPage("selectUserArchivesList",
-                "selectUserArchivesCount", params, in.getPageNo(), in.getPageSize());
+        if (in.getSignBills()!=null)params.put("signBills", in.getSignBills());
+        if (in.getStartTime() != null&&in.getEndTime() != null){
+            params.put("startTime", in.getStartTime());
+            params.put("endTime", in.getEndTime()+" 23:59:59");
+        }
+        return params;
     }
+
+    @Override
+    public Object selectUserArchivesExport(InputSelectUserArchives in) {
+        Map<String, Object> params = getParams(in);
+        List<OutSelectUserArchives> list= (List<OutSelectUserArchives>) findList("selectUserArchivesList",
+                params, 1, 999999);
+        NewExcelUtil<OutSelectUserArchives> newExcelUtil = new NewExcelUtil<>(OutSelectUserArchives.class);
+        return newExcelUtil.exportExcel( list,"用户档案",uploadPath);
+    }
+
+
 }

+ 9 - 0
src/main/java/com/goafanti/order/bo/InputOrderNewListBo.java

@@ -25,9 +25,18 @@ public class InputOrderNewListBo {
     private Integer projectType;
     private Integer processStatus;
     private Integer tag;
+    private Integer scoreStatus;
     private  Integer pageNo;
     private Integer pageSize;
 
+    public Integer getScoreStatus() {
+        return scoreStatus;
+    }
+
+    public void setScoreStatus(Integer scoreStatus) {
+        this.scoreStatus = scoreStatus;
+    }
+
     public String getType() {
         return type;
     }

+ 43 - 0
src/main/java/com/goafanti/order/bo/OutProjectStatistics.java

@@ -1,6 +1,9 @@
 package com.goafanti.order.bo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.math.BigDecimal;
+import java.util.Date;
 
 
 public class OutProjectStatistics {
@@ -19,6 +22,7 @@ public class OutProjectStatistics {
 	private Integer projectStatus;
 	private Integer formRetrieve;
 	private Integer satisfactionDegree;
+	private Integer cSort;
 
 
 
@@ -78,6 +82,45 @@ public class OutProjectStatistics {
 	private String type;
 	private String typeExplain;
 
+
+
+	private Integer scoreStatus;
+	private Integer scoreNumber;
+	private Date scoreTime;
+
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	public Date getScoreTime() {
+		return scoreTime;
+	}
+
+	public void setScoreTime(Date scoreTime) {
+		this.scoreTime = scoreTime;
+	}
+
+	public Integer getcSort() {
+		return cSort;
+	}
+
+	public void setcSort(Integer cSort) {
+		this.cSort = cSort;
+	}
+
+	public Integer getScoreStatus() {
+		return scoreStatus;
+	}
+
+	public void setScoreStatus(Integer scoreStatus) {
+		this.scoreStatus = scoreStatus;
+	}
+
+	public Integer getScoreNumber() {
+		return scoreNumber;
+	}
+
+	public void setScoreNumber(Integer scoreNumber) {
+		this.scoreNumber = scoreNumber;
+	}
+
 	public Integer getApproval() {
 		return approval;
 	}

+ 11 - 0
src/main/java/com/goafanti/order/bo/TOrderNewBo.java

@@ -92,6 +92,7 @@ public class TOrderNewBo extends TOrderNew{
 	 */
 	private String addDeductionOther;
 	private Integer approvalStatus;
+	private Integer scoreStatus;
 	private String approvalAid;
 	private String approvalName;
 	private String operationGuaranteeId;
@@ -101,6 +102,16 @@ public class TOrderNewBo extends TOrderNew{
 
 	private String type;
 
+	@Override
+	public Integer getScoreStatus() {
+		return scoreStatus;
+	}
+
+	@Override
+	public void setScoreStatus(Integer scoreStatus) {
+		this.scoreStatus = scoreStatus;
+	}
+
 	public String getTypeExplain() {
 		return typeExplain;
 	}

+ 6 - 3
src/main/java/com/goafanti/order/bo/TOrderTaskBo.java

@@ -1,12 +1,12 @@
 package com.goafanti.order.bo;
 
-import java.math.BigDecimal;
-import java.util.List;
-
 import com.goafanti.common.model.TOrderTask;
 import com.goafanti.common.utils.excel.Excel;
 import com.goafanti.order.enums.NewProjectStatus;
 
+import java.math.BigDecimal;
+import java.util.List;
+
 public class TOrderTaskBo extends TOrderTask{
 	/**
 	 *
@@ -53,10 +53,13 @@ public class TOrderTaskBo extends TOrderTask{
 	private Integer	stopType;
 	private Integer	projectStopStatus;
 	private Integer	change;
+
 	private String lastYear;
 	private BigDecimal lastYearCapital;
 	private BigDecimal lastYearIncome;
 
+
+
 	public Integer getChange() {
 		return change;
 	}

+ 18 - 0
src/main/java/com/goafanti/order/bo/TOrderTaskListBo.java

@@ -101,10 +101,28 @@ public class TOrderTaskListBo {
 	private Integer processStatus;
 
 	private Integer memberType;
+	private Integer scoreStatus;
+	private Integer  scoreNumber;
 
 	private String receiverMobile;
 
 
+	public Integer getScoreStatus() {
+		return scoreStatus;
+	}
+
+	public void setScoreStatus(Integer scoreStatus) {
+		this.scoreStatus = scoreStatus;
+	}
+
+	public Integer getScoreNumber() {
+		return scoreNumber;
+	}
+
+	public void setScoreNumber(Integer scoreNumber) {
+		this.scoreNumber = scoreNumber;
+	}
+
 	public String getType() {
 		return type;
 	}

+ 87 - 0
src/main/java/com/goafanti/order/bo/TaskScore/InputTaskScore.java

@@ -0,0 +1,87 @@
+package com.goafanti.order.bo.TaskScore;
+
+
+public class InputTaskScore {
+    /**
+     * 用户名称
+     */
+    private String name;
+    /**
+     * 部门编号
+     */
+    private String depId;
+    /**
+     * 角色编号
+     */
+    private String roleId;
+    /**
+     * 职位编号
+     */
+    private String position;
+
+    private Integer status;
+    /**
+     * 页数
+     */
+    private Integer pageNo;
+    /**
+     * 每页显示条数
+     */
+    private Integer pageSize;
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDepId() {
+        return depId;
+    }
+
+    public void setDepId(String depId) {
+        this.depId = depId;
+    }
+
+    public String getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(String roleId) {
+        this.roleId = roleId;
+    }
+
+    public String getPosition() {
+        return position;
+    }
+
+    public void setPosition(String position) {
+        this.position = position;
+    }
+
+    public Integer getPageNo() {
+        return pageNo;
+    }
+
+    public void setPageNo(Integer pageNo) {
+        this.pageNo = pageNo;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+}

+ 209 - 0
src/main/java/com/goafanti/order/bo/TaskScore/OutAdminTaskScore.java

@@ -0,0 +1,209 @@
+package com.goafanti.order.bo.TaskScore;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.goafanti.common.utils.excel.Excel;
+
+import java.util.Date;
+
+public class OutAdminTaskScore {
+    /**
+     * 高新&科技总数
+     */
+    @Excel(name = "高新&科技总数")
+    private int htSatCount;
+    /**
+     * 高新&科技待评分数
+     */
+    @Excel(name = "高新&科技待评分数")
+    private int htSatNotScoreCount;
+    /**
+     * 高新&科技已评分数
+     */
+    @Excel(name = "高新&科技已评分数")
+    private int htSatScoreCount;
+
+
+    /**
+     * 高新&科技平均分
+     */
+    @Excel(name = "高新&科技平均分")
+    private double htSatScoreAverage;
+    /**
+     * 会员数
+     */
+    @Excel(name = "会员数")
+    private int memberCount;
+    /**
+     * 会员待评分数
+     */
+    @Excel(name = "会员待评分数")
+    private int memberNotScoreCount;
+    /**
+     * 会员评分数
+     */
+    @Excel(name = "会员已评分数")
+    private int memberScoreCount;
+    /**
+     * 会员平均分
+     */
+    @Excel(name = "会员平均分")
+    private double memberScoreAverage;
+    private String id;
+    /**
+     * 用户姓名
+     */
+    @Excel(name = "用户姓名")
+    private String name;
+    private String depId;
+    /**
+     * 部门名称
+     */
+    @Excel(name = "部门名称")
+    private String depName;
+    private String superId;
+    /**
+     * 上级主管名称
+     */
+    @Excel(name = "上级主管名称")
+    private String superName;
+    /**
+     * 会员平均分
+     */
+    @Excel(name = "状态",readConverterExp = "0=正常,1=锁定")
+    private String status;
+    /**
+     * 最后登录时间
+     */
+    @Excel(name = "最后登录时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date lastLoginTime;
+
+
+    public int getHtSatCount() {
+        return htSatCount;
+    }
+
+    public void setHtSatCount(int htSatCount) {
+        this.htSatCount = htSatCount;
+    }
+
+    public int getHtSatNotScoreCount() {
+        return htSatNotScoreCount;
+    }
+
+    public void setHtSatNotScoreCount(int htSatNotScoreCount) {
+        this.htSatNotScoreCount = htSatNotScoreCount;
+    }
+
+    public int getHtSatScoreCount() {
+        return htSatScoreCount;
+    }
+
+    public void setHtSatScoreCount(int htSatScoreCount) {
+        this.htSatScoreCount = htSatScoreCount;
+    }
+
+    public double getHtSatScoreAverage() {
+        return htSatScoreAverage;
+    }
+
+    public void setHtSatScoreAverage(double htSatScoreAverage) {
+        this.htSatScoreAverage = htSatScoreAverage;
+    }
+
+    public int getMemberCount() {
+        return memberCount;
+    }
+
+    public void setMemberCount(int memberCount) {
+        this.memberCount = memberCount;
+    }
+
+    public int getMemberNotScoreCount() {
+        return memberNotScoreCount;
+    }
+
+    public void setMemberNotScoreCount(int memberNotScoreCount) {
+        this.memberNotScoreCount = memberNotScoreCount;
+    }
+
+    public int getMemberScoreCount() {
+        return memberScoreCount;
+    }
+
+    public void setMemberScoreCount(int memberScoreCount) {
+        this.memberScoreCount = memberScoreCount;
+    }
+
+    public double getMemberScoreAverage() {
+        return memberScoreAverage;
+    }
+
+    public void setMemberScoreAverage(double memberScoreAverage) {
+        this.memberScoreAverage = memberScoreAverage;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDepId() {
+        return depId;
+    }
+
+    public void setDepId(String depId) {
+        this.depId = depId;
+    }
+
+    public String getDepName() {
+        return depName;
+    }
+
+    public void setDepName(String depName) {
+        this.depName = depName;
+    }
+
+    public String getSuperId() {
+        return superId;
+    }
+
+    public void setSuperId(String superId) {
+        this.superId = superId;
+    }
+
+    public String getSuperName() {
+        return superName;
+    }
+
+    public void setSuperName(String superName) {
+        this.superName = superName;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    public Date getLastLoginTime() {
+        return lastLoginTime;
+    }
+
+    public void setLastLoginTime(Date lastLoginTime) {
+        this.lastLoginTime = lastLoginTime;
+    }
+}

+ 25 - 0
src/main/java/com/goafanti/order/bo/outStatistics/OutProjectStatisticsAudit.java

@@ -4,6 +4,7 @@ import com.goafanti.common.utils.excel.Excel;
 import com.goafanti.order.bo.OutProjectStatistics;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 public class OutProjectStatisticsAudit extends OutProjectStatistics {
     private Integer id;
@@ -84,6 +85,30 @@ public class OutProjectStatisticsAudit extends OutProjectStatistics {
 
 
     private Integer	certificatesCount;
+    @Excel(name="评分")
+    private Integer scoreNumber;
+    @Excel(name="评分时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date scoreTime;
+
+    @Override
+    public Date getScoreTime() {
+        return scoreTime;
+    }
+
+    @Override
+    public void setScoreTime(Date scoreTime) {
+        this.scoreTime = scoreTime;
+    }
+
+    @Override
+    public Integer getScoreNumber() {
+        return scoreNumber;
+    }
+
+    @Override
+    public void setScoreNumber(Integer scoreNumber) {
+        this.scoreNumber = scoreNumber;
+    }
 
     @Override
     public Integer getApproval() {

+ 25 - 0
src/main/java/com/goafanti/order/bo/outStatistics/OutProjectStatisticsCommon.java

@@ -4,6 +4,7 @@ import com.goafanti.common.utils.excel.Excel;
 import com.goafanti.order.bo.OutProjectStatistics;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 public class OutProjectStatisticsCommon extends OutProjectStatistics {
     private Integer id;
@@ -54,6 +55,30 @@ public class OutProjectStatisticsCommon extends OutProjectStatistics {
     @Excel(name="特批类型")
     private String type;
     private String typeExplain;
+    @Excel(name="评分")
+    private Integer scoreNumber;
+    @Excel(name="评分时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date scoreTime;
+
+    @Override
+    public Date getScoreTime() {
+        return scoreTime;
+    }
+
+    @Override
+    public void setScoreTime(Date scoreTime) {
+        this.scoreTime = scoreTime;
+    }
+
+    @Override
+    public Integer getScoreNumber() {
+        return scoreNumber;
+    }
+
+    @Override
+    public void setScoreNumber(Integer scoreNumber) {
+        this.scoreNumber = scoreNumber;
+    }
 
     @Override
     public Integer getApproval() {

+ 25 - 0
src/main/java/com/goafanti/order/bo/outStatistics/OutProjectStatisticsDoubleSoft.java

@@ -4,6 +4,7 @@ import com.goafanti.common.utils.excel.Excel;
 import com.goafanti.order.bo.OutProjectStatistics;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 public class OutProjectStatisticsDoubleSoft extends OutProjectStatistics {
     private Integer id;
@@ -57,6 +58,30 @@ public class OutProjectStatisticsDoubleSoft extends OutProjectStatistics {
     @Excel(name="特批类型")
     private String type;
     private String typeExplain;
+    @Excel(name="评分")
+    private Integer scoreNumber;
+    @Excel(name="评分时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date scoreTime;
+
+    @Override
+    public Date getScoreTime() {
+        return scoreTime;
+    }
+
+    @Override
+    public void setScoreTime(Date scoreTime) {
+        this.scoreTime = scoreTime;
+    }
+
+    @Override
+    public Integer getScoreNumber() {
+        return scoreNumber;
+    }
+
+    @Override
+    public void setScoreNumber(Integer scoreNumber) {
+        this.scoreNumber = scoreNumber;
+    }
 
     @Override
     public Integer getApproval() {

+ 25 - 0
src/main/java/com/goafanti/order/bo/outStatistics/OutProjectStatisticsHighTech.java

@@ -4,6 +4,7 @@ import com.goafanti.common.utils.excel.Excel;
 import com.goafanti.order.bo.OutProjectStatistics;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 public class OutProjectStatisticsHighTech extends OutProjectStatistics {
     private Integer id;
@@ -88,6 +89,30 @@ public class OutProjectStatisticsHighTech extends OutProjectStatistics {
 
     private Integer	certificatesCount;
 
+    @Excel(name="评分")
+    private Integer scoreNumber;
+    @Excel(name="评分时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date scoreTime;
+
+    @Override
+    public Date getScoreTime() {
+        return scoreTime;
+    }
+
+    @Override
+    public void setScoreTime(Date scoreTime) {
+        this.scoreTime = scoreTime;
+    }
+
+    @Override
+    public Integer getScoreNumber() {
+        return scoreNumber;
+    }
+
+    @Override
+    public void setScoreNumber(Integer scoreNumber) {
+        this.scoreNumber = scoreNumber;
+    }
     @Override
     public Integer getApproval() {
         return approval;

+ 25 - 0
src/main/java/com/goafanti/order/bo/outStatistics/OutProjectStatisticsMember.java

@@ -4,6 +4,7 @@ import com.goafanti.common.utils.excel.Excel;
 import com.goafanti.order.bo.OutProjectStatistics;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 public class OutProjectStatisticsMember extends OutProjectStatistics {
     private Integer id;
@@ -85,6 +86,30 @@ public class OutProjectStatisticsMember extends OutProjectStatistics {
     private Integer yearSum;
     @Excel(name = "合同期")
     private String contractTerm;
+    @Excel(name="评分")
+    private Integer scoreNumber;
+    @Excel(name="评分时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date scoreTime;
+
+    @Override
+    public Date getScoreTime() {
+        return scoreTime;
+    }
+
+    @Override
+    public void setScoreTime(Date scoreTime) {
+        this.scoreTime = scoreTime;
+    }
+
+    @Override
+    public Integer getScoreNumber() {
+        return scoreNumber;
+    }
+
+    @Override
+    public void setScoreNumber(Integer scoreNumber) {
+        this.scoreNumber = scoreNumber;
+    }
 
     @Override
     public Integer getApproval() {

+ 25 - 0
src/main/java/com/goafanti/order/bo/outStatistics/OutProjectStatisticsPatent.java

@@ -4,6 +4,7 @@ import com.goafanti.common.utils.excel.Excel;
 import com.goafanti.order.bo.OutProjectStatistics;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 public class OutProjectStatisticsPatent extends OutProjectStatistics {
     private Integer id;
@@ -84,6 +85,30 @@ public class OutProjectStatisticsPatent extends OutProjectStatistics {
     private Integer	ifMaterial;
     private Integer	urgentDay;
     private Integer	certificatesCount;
+    @Excel(name="评分")
+    private Integer scoreNumber;
+    @Excel(name="评分时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date scoreTime;
+
+    @Override
+    public Date getScoreTime() {
+        return scoreTime;
+    }
+
+    @Override
+    public void setScoreTime(Date scoreTime) {
+        this.scoreTime = scoreTime;
+    }
+
+    @Override
+    public Integer getScoreNumber() {
+        return scoreNumber;
+    }
+
+    @Override
+    public void setScoreNumber(Integer scoreNumber) {
+        this.scoreNumber = scoreNumber;
+    }
 
     @Override
     public Integer getApproval() {

+ 25 - 0
src/main/java/com/goafanti/order/bo/outStatistics/OutProjectStatisticsSoftwareWorks.java

@@ -4,6 +4,7 @@ import com.goafanti.common.utils.excel.Excel;
 import com.goafanti.order.bo.OutProjectStatistics;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 public class OutProjectStatisticsSoftwareWorks extends OutProjectStatistics {
     private Integer id;
@@ -82,6 +83,30 @@ public class OutProjectStatisticsSoftwareWorks extends OutProjectStatistics {
     private String	patentName;
     private String	acceptTime;
     private Integer	certificatesCount;
+    @Excel(name="评分")
+    private Integer scoreNumber;
+    @Excel(name="评分时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date scoreTime;
+
+    @Override
+    public Date getScoreTime() {
+        return scoreTime;
+    }
+
+    @Override
+    public void setScoreTime(Date scoreTime) {
+        this.scoreTime = scoreTime;
+    }
+
+    @Override
+    public Integer getScoreNumber() {
+        return scoreNumber;
+    }
+
+    @Override
+    public void setScoreNumber(Integer scoreNumber) {
+        this.scoreNumber = scoreNumber;
+    }
 
     @Override
     public Integer getApproval() {

+ 1 - 1
src/main/java/com/goafanti/order/controller/OrderProjectApiController.java

@@ -166,7 +166,7 @@ public class OrderProjectApiController extends CertifyApiController {
 		return res;
 	}
 	/**
-	 * 修改项目状态(咨询师)、项目状态修改
+	 * 修改项目状态(咨询师)、项目状态修改\修改状态
 	 */
 	@RequestMapping(value="/updateProjectStatus" ,method = RequestMethod.POST)
 	public Result updateProjectStatus(@Valid UpdateProjectStatusBo a,BindingResult bindingResult){

+ 123 - 0
src/main/java/com/goafanti/order/controller/TaskScoreController.java

@@ -0,0 +1,123 @@
+package com.goafanti.order.controller;
+
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.controller.BaseController;
+import com.goafanti.common.model.TaskScore;
+import com.goafanti.order.bo.TaskScore.InputTaskScore;
+import com.goafanti.order.bo.TaskScore.OutAdminTaskScore;
+import com.goafanti.order.service.TaskScoreService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * 项目评分列表(TaskScore)表控制层
+ *
+ * @author makejava
+ * @since 2024-09-27 11:51:57
+ */
+@RestController
+@RequestMapping("/api/admin/taskScore")
+public class TaskScoreController extends BaseController {
+    /**
+     * 服务对象
+     */
+    @Resource
+    private TaskScoreService taskScoreService;
+
+
+    /**
+     * 新增数据
+     *
+     * @param taskScore 实体
+     * @return 新增结果
+     */
+    @PostMapping("/add")
+    public Result add(TaskScore taskScore) {
+        return new Result<>().data(this.taskScoreService.insert(taskScore));
+    }
+
+
+    /**
+     * 通过主键查询单条数据
+     *
+     * @param id 主键
+     * @return 单条数据
+     */
+    @GetMapping("/get")
+    public Result<TaskScore> queryById(Integer id) {
+        return new Result<>().data(this.taskScoreService.queryById(id));
+    }
+
+    /**
+     * 通过项目编号获取项目评分
+     *
+     * @param tid 主键
+     * @return 单条数据
+     */
+    @GetMapping("/queryByTid")
+    public Result<TaskScore> queryByTid(Integer tid) {
+        return new Result<>().data(this.taskScoreService.queryByTid(tid));
+    }
+
+
+    /**
+     * 编辑数据
+     *
+     * @param taskScore 实体
+     * @return 编辑结果
+     */
+    @PostMapping("/update")
+    public Result edit(TaskScore taskScore) {
+        return new Result<>().data(this.taskScoreService.update(taskScore));
+    }
+
+    /**
+     * 编辑项目评分
+     *
+     * @param taskScore 实体
+     * @return 编辑结果
+     */
+    @PostMapping("/updateByTid")
+    public Result updateByTid(TaskScore taskScore) {
+        return new Result<>().data(this.taskScoreService.updateByTid(taskScore));
+    }
+
+    /**
+     * 删除数据
+     *
+     * @param id 主键
+     * @return 删除是否成功
+     */
+    @GetMapping("/delete")
+    public Result deleteById(Integer id) {
+        return new Result<>().data(this.taskScoreService.deleteById(id));
+    }
+
+    /**
+     * 人员评分列表
+     *
+     * @param in 参数
+     */
+    @GetMapping("/list")
+    public Result<OutAdminTaskScore> list(InputTaskScore in) {
+        return new Result<>().data(this.taskScoreService.list(in));
+    }
+
+    /**
+     * 人员评分列表
+     *
+     * @param in 参数
+     */
+    @GetMapping("/list/export")
+    public Result listExport(InputTaskScore in) {
+        return this.taskScoreService.listExport(in);
+    }
+
+
+
+}
+

+ 65 - 0
src/main/java/com/goafanti/order/service/TaskScoreService.java

@@ -0,0 +1,65 @@
+package com.goafanti.order.service;
+
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.model.TaskScore;
+import com.goafanti.order.bo.TaskScore.InputTaskScore;
+
+/**
+ * 项目评分列表(TaskScore)表服务接口
+ *
+ * @author makejava
+ * @since 2024-09-27 11:51:57
+ */
+public interface TaskScoreService {
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    TaskScore queryById(Integer id);
+
+
+    /**
+     * 新增数据
+     *
+     * @param taskScore 实例对象
+     * @return 实例对象
+     */
+    TaskScore insert(TaskScore taskScore);
+
+    /**
+     * 修改数据
+     *
+     * @param taskScore 实例对象
+     * @return 实例对象
+     */
+    TaskScore update(TaskScore taskScore);
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 是否成功
+     */
+    boolean deleteById(Integer id);
+
+    /**
+     * 列表数据
+     *
+     * @param in 参数
+     * @return 是否成功
+     */
+    Object list(InputTaskScore in);
+
+    Object updateByTid(TaskScore taskScore);
+
+    void updateTOrderNewByTid(Integer tid);
+
+    TaskScore queryByTid(Integer tid);
+
+    Result listExport(InputTaskScore in);
+
+    void updateAdminByTid(Integer id);
+}

+ 11 - 11
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;
@@ -114,7 +114,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 	}
 
 	private TOrderNew checkDeleteSign(String orderNo) {
-		TOrderNew t=tOrderNewMapper.selectByPrimaryKey(orderNo);
+		TOrderNew t=tOrderNewMapper.queryById(orderNo);
 		//if(t.getDeleteSign()==2) throw new BusinessException(new Error(ErrorConstants.ORDER_ALREADY_REVOKE, t.getOrderNo(),""));
 		return t;
 	}
@@ -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());
@@ -423,7 +423,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		//修改订单数据结算状态和结算金额
 		TOrderNew orderNew = new TOrderNew();
 		orderNew.setOrderNo(billNew.getOrderNo());
-		TOrderNew o = tOrderNewMapper.selectByPrimaryKey(billNew.getOrderNo());
+		TOrderNew o = tOrderNewMapper.queryById(billNew.getOrderNo());
 		//这里修改退款金额数据之前退的金额加上本次退的金额
 		orderNew.setRefundAmount(billNew.getTransactionAmount().add(o.getRefundAmount()));
 		orderNew.setRefundAmount(o.getSettlementAmount().subtract(billNew.getTransactionAmount().abs()));
@@ -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;
@@ -465,7 +465,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 
 	private void updateCount(String orderNo){
 		//获得订单数据
-		TOrderNew new1 = tOrderNewMapper.selectByPrimaryKey(orderNo);
+		TOrderNew new1 = tOrderNewMapper.queryById(orderNo);
 		Calendar cal = Calendar.getInstance();
 		cal.setTime(new1.getSignTime());
 		int sy = cal.get(Calendar.YEAR);
@@ -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;
 	}
 

+ 7 - 12
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 {
@@ -64,7 +59,7 @@ public class OrderBillServiceImpl extends BaseMybatisDao<TOrderBillNewMapper> im
 	@Override
 	public int deleteMyBill(String billNo) {
 		TOrderBillNew tbn=billNewMapper.selectByPrimaryKey(billNo);
-		TOrderNew o=tOrderNewMapper.selectByPrimaryKey(tbn.getOrderNo());
+		TOrderNew o=tOrderNewMapper.queryById(tbn.getOrderNo());
 		TOrderNew o2=new TOrderNew();
 		o2.setOrderNo(o.getOrderNo());
 		o2.setSettlementAmount(o.getSettlementAmount().subtract(tbn.getTransactionAmount()));
@@ -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);

+ 6 - 13
src/main/java/com/goafanti/order/service/impl/OrderBonusServiceImpl.java

@@ -1,18 +1,6 @@
 package com.goafanti.order.service.impl;
 
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
 import com.goafanti.admin.service.DepartmentService;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.dao.TOrderBonusMapper;
@@ -29,6 +17,11 @@ import com.goafanti.order.bo.OrderListBo;
 import com.goafanti.order.bo.OrderReportBo;
 import com.goafanti.order.bo.TOrderBonusBo;
 import com.goafanti.order.service.OrderBonusService;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
 
 @Service
 public class OrderBonusServiceImpl extends BaseMybatisDao<TOrderBonusMapper> implements OrderBonusService {
@@ -54,7 +47,7 @@ public class OrderBonusServiceImpl extends BaseMybatisDao<TOrderBonusMapper> imp
 	@Override
 	public Integer updateBounsPaymnetStatus(String id,String orderNo) {
 		//先确定订单有没有校对信息
-		TOrderNew o = orderNewMapper.selectByPrimaryKey(orderNo);
+		TOrderNew o = orderNewMapper.queryById(orderNo);
 		if(null == o || StringUtils.isBlank(o.getProofAid())){//不存在或者没有校对
 			return -1;
 		}

+ 12 - 12
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());
@@ -237,7 +237,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		if (!list.isEmpty()){
 			for (NewOrderChangeBo c : list) {
 				if (c.getContacts()==null){
-					TOrderNew t=tOrderNewMapper.selectByPrimaryKey(orderNo);
+					TOrderNew t=tOrderNewMapper.queryById(orderNo);
 					c.setContacts(t.getContacts());
 					c.setContactMobile(t.getContactMobile());
 				}
@@ -445,7 +445,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	}
 
 	private boolean pushApproval(NewOrderChangeBo nb, Department dep,String remarks) {
-		TOrderNew tOrderNew = tOrderNewMapper.selectByPrimaryKey(nb.getOrderNo());
+		TOrderNew tOrderNew = tOrderNewMapper.queryById(nb.getOrderNo());
 		Date date = new Date();
 		date.setTime(date.getTime()+500);
 		if (tOrderNew.getSalesmanId().equals(AFTConstants.CAOJIN_AID)) {
@@ -630,7 +630,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	 * 变更完成复制出原订单镜像
 	 */
 	private void changeAdopt(NewOrderChangeBo nb) {
-		TOrderNew t1=tOrderNewMapper.selectByPrimaryKey(nb.getOrderNo());
+		TOrderNew t1=tOrderNewMapper.queryById(nb.getOrderNo());
 		List<OutNewOrderDunBo> td2=newOrderDunMapper.selectListNewOrderDun(nb.getOrderNo(),  null);
 		List<TOrderTaskBo> tt1=tOrderTaskMapper.selectOrderTaskAll(nb.getOrderNo(),null);
 		List<TOrderLogBo> tl1=tOrderLogMapper.selectOrderByNo(nb.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()){
 			//不是仅合同变更就看营销经理是否存在
@@ -993,7 +993,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		date.setTime(date.getTime()+500);
 		addOrderChangeLog("变更完成。", 4, nb.getOrderNo(), nb.getId(),date);
 		pushGeneralSendNoticeAndEmail(alist,NoticeStatus.ORDER_CHANGE_END.getCode(), order, TokenManager.getAdminId(),0);
-		TOrderNew tOrderNew = tOrderNewMapper.selectByPrimaryKey(nb.getOrderNo());
+		TOrderNew tOrderNew = tOrderNewMapper.queryById(nb.getOrderNo());
 		orderNewService.pushOrderPublicReleaseCount(tOrderNew);
 		//修改投标标识
 		tOrderMidMapper.updateBidTypeByOrderNo(nb.getOrderNo());
@@ -1054,7 +1054,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	 * @param nb
 	 */
 	private TOrderNew pushChange(NewOrderChangeBo nb) {
-		TOrderNew o=tOrderNewMapper.selectByPrimaryKey(nb.getOrderNo());
+		TOrderNew o=tOrderNewMapper.queryById(nb.getOrderNo());
 		NewOrderChangeBo nob=newOrderChangeMapper.selectById(nb.getId());
 //		变更类型 0退单退款 1项目及金额变更 2仅项目变更 3仅金额变更 4重报 5赠送
 		if(nob.getType()==OrderChangeType.TDTK.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;
 	}
@@ -1544,7 +1544,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				if (noc.getRefundStatus()!=1) {
 					List<OutNewOrderRefund> list=listRefund(id);
 					BigDecimal bd=new BigDecimal(0);
-					TOrderNew order=tOrderNewMapper.selectByPrimaryKey(noc.getOrderNo());
+					TOrderNew order=tOrderNewMapper.queryById(noc.getOrderNo());
 					for (OutNewOrderRefund o : list) {
 						TOrderBillNew tbn =new TOrderBillNew();
 						tbn.setOrderNo(o.getOrderNo());
@@ -1577,7 +1577,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			@Override
 			public boolean checkrefund(InputNewOrderRefund or) {
 				if (or.getOrderNo()!=null) {
-					TOrderNew o=tOrderNewMapper.selectByPrimaryKey(or.getOrderNo());
+					TOrderNew o=tOrderNewMapper.queryById(or.getOrderNo());
 					BigDecimal refund=new BigDecimal(0);
 					List<OutNewOrderRefund> list=listRefund(or.getCid());
 					refund=refund.add(or.getRefundAmount());
@@ -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;
 			}
 

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

@@ -136,7 +136,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 	private void sendNoticeAndEmail(TOrderInvoice o) {
 		List<String> aids = new ArrayList<>();
 		if (o.getStatus()==1) {//发起
-			TOrderNew t=tOrderNewMapper.selectByPrimaryKey(o.getOrderNo());
+			TOrderNew t=tOrderNewMapper.queryById(o.getOrderNo());
 			if (o.getType()==0) {//省内
 				if(o.getApproval()==0) {
 					aids.add(departmentMapper.selectByPrimaryKey(t.getOrderDep()).getFinanceId());
@@ -163,7 +163,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 	@SuppressWarnings("deprecation")
 	@Override
 	public boolean checkAmount(TOrderInvoice t) {
-		TOrderNew tn=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
+		TOrderNew tn=tOrderNewMapper.queryById(t.getOrderNo());
 
 			String i=tOrderInvoiceMapper.checkApplyAmount(t.getOrderNo(),t.getId());//新建时直接查所有数据,修改时除掉修改订单
 			//处理精度问题
@@ -270,7 +270,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 		//examine 2通过 3拒绝
 		List<String> aids = new ArrayList<>();
 		TOrderInvoice t2=tOrderInvoiceMapper.selectByPrimaryKey(id);
-		TOrderNew o=tOrderNewMapper.selectByPrimaryKey(t2.getOrderNo());
+		TOrderNew o=tOrderNewMapper.queryById(t2.getOrderNo());
 		Integer type=null;
 		if(examine==3){
 			type=NoticeStatus.ORDER_INVPICE_NO.getCode();
@@ -376,7 +376,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 		t.setType(o.getType());
 		t.setStatus(o.getStatus());
 		t.setOrderNo(o.getOrderNo());
-		TOrderNew ts=tOrderNewMapper.selectByPrimaryKey(o.getOrderNo());
+		TOrderNew ts=tOrderNewMapper.queryById(o.getOrderNo());
 		//examine 2通过 3拒绝
 		Integer type =null;
 		if(examine==3) {

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

@@ -231,7 +231,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@Override
 	public InputAddTask addOrderTask(InputAddTask t) {
-		TOrderNew order=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
+		TOrderNew order=tOrderNewMapper.queryById(t.getOrderNo());
 		checkOrder(order,t);
 		t.setTaskStatus(TaskState.WFP.getCode());
 		t.setProjectStatus(NewProjectStatus.WQD.getCode());
@@ -505,7 +505,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	@Transactional
 	public int updateServiceOrder(TOrderNewWithBLOBs t, Integer isSubmit) {
 		Date date=new Date();
-		TOrderNew t2=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
+		TOrderNew t2=tOrderNewMapper.queryById(t.getOrderNo());
 		//判断手机号码是否存在
 		if (StringUtils.isNotBlank(t.getContacts())&&StringUtils.isNotBlank(t.getContactMobile())&&
 				organizationContactBookMapper.checkContacts(t2.getBuyerId(), t2.getContactMobile(),TokenManager.getAdminId()==null?"1":TokenManager.getAdminId() )>0) {
@@ -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);
@@ -878,7 +878,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);
 	}
 
 
@@ -1281,6 +1281,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			}
 		}
 		params.put("outsource", in.getOutsource());
+		params.put("scoreStatus", in.getScoreStatus());
 		return null;
 	}
 
@@ -1356,7 +1357,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@Override
 	public int updateSalesType(TOrderNew in) {
-		return tOrderNewMapper.updateByPrimaryKeySelective(in);
+		return tOrderNewMapper.update(in);
 	}
 
 
@@ -1405,7 +1406,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( "邮件发送失败,对方设置邮箱错误","邮件发送失败,对方设置邮箱错误"));
 		}
@@ -1588,7 +1589,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	private void addBackOrder(String orderNo, String reason) {
 		TOrderBack ob=new TOrderBack();
-		TOrderNew tOrder= tOrderNewMapper.selectByPrimaryKey(orderNo);
+		TOrderNew tOrder= tOrderNewMapper.queryById(orderNo);
 		ob.setCreateTime(new Date());
 		ob.setOrderNo(orderNo);
 		ob.setReason(reason);
@@ -1728,7 +1729,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());
@@ -1775,7 +1776,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;
 	}
@@ -1807,7 +1808,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@Override
 	public boolean chekeOrderStatus(String orderNo) {
-		TOrderNew tOrder= tOrderNewMapper.selectByPrimaryKey(orderNo);
+		TOrderNew tOrder= tOrderNewMapper.queryById(orderNo);
 		if (tOrder.getOrderStatus().equals(OrderNewState.QDDS.getCode()) || tOrder.getOrderStatus().equals(OrderNewState.QDSHTG.getCode())) {
 			return false;
 		}
@@ -1816,7 +1817,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@Override
 	public boolean chekeProcessStatus(String orderNo) {
-		TOrderNew tOrder= tOrderNewMapper.selectByPrimaryKey(orderNo);
+		TOrderNew tOrder= tOrderNewMapper.queryById(orderNo);
 		if (tOrder.getProcessStatus().equals(ProcessStatus.YPYXY.getCode())) {
 			return false;
 		}
@@ -1826,7 +1827,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@Override
 	public boolean chekeApprovalOrderStatus(String orderNo) {
-		TOrderNew tOrder= tOrderNewMapper.selectByPrimaryKey(orderNo);
+		TOrderNew tOrder= tOrderNewMapper.queryById(orderNo);
 		if (tOrder.getApproval().equals(ApprovalNewState.FTP.getCode()) ||
 				tOrder.getOrderStatus().equals(OrderNewState.QDSHJJ.getCode()) ||
 				tOrder.getOrderStatus().equals(OrderNewState.YBH.getCode())) {
@@ -1837,7 +1838,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@Override
 	public int deleteOrderNew(String orderNo) {
-		TOrderNew t=tOrderNewMapper.selectByPrimaryKey(orderNo);
+		TOrderNew t=tOrderNewMapper.queryById(orderNo);
 		if (t.getOrderStatus().equals(OrderNewState.YBH.getCode()) || t.getOrderStatus().equals(OrderNewState.YTD.getCode()) ||
 				t.getOrderStatus().equals(OrderNewState.DQD.getCode()) || t.getOrderStatus().equals(OrderNewState.QDSHJJ.getCode())) {
 			t.setOrderNo(orderNo);
@@ -1846,7 +1847,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;
 	}
@@ -1879,7 +1880,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@Override
 	public boolean checkOderSettlementAmount(String orderNo) {
-		TOrderNew tOrder= tOrderNewMapper.selectByPrimaryKey(orderNo);
+		TOrderNew tOrder= tOrderNewMapper.queryById(orderNo);
 		if (tOrder.getSettlementAmount()==null||
 				tOrder.getSettlementAmount().doubleValue()==0||
 				tOrder.getOrderStatus().equals(OrderNewState.TDZ.getCode())){
@@ -1974,7 +1975,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@Override
 	public int updateOrderOver(String orderNo) {
-		TOrderNew t=tOrderNewMapper.selectByPrimaryKey(orderNo);
+		TOrderNew t=tOrderNewMapper.queryById(orderNo);
 		if (!t.getLiquidationStatus().equals(LiquidationNewState.ALREADY_PAY.getCode()) ||
 				!t.getProcessStatus().equals(ProcessStatus.YQBFPZXSGLY.getCode())) {
 			return -1;
@@ -1987,7 +1988,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
@@ -2012,7 +2013,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;
@@ -2103,7 +2104,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	}
 	private TOrderNew checkDeleteSign(String orderNo) {
-		TOrderNew t=tOrderNewMapper.selectByPrimaryKey(orderNo);
+		TOrderNew t=tOrderNewMapper.queryById(orderNo);
 		//if(t.getDeleteSign()==2) throw new BusinessException(new Error(ErrorConstants.ORDER_ALREADY_REVOKE, t.getOrderNo(),""));
 		return t;
 	}
@@ -2503,7 +2504,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;
 	}
@@ -2520,7 +2521,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		for (TOrderNew e : tOrderNews) {
 			pushOrderDunContent(e);
 		}
-//		TOrderNew tOrderNew = tOrderNewMapper.selectByPrimaryKey("412255829035991040");
+//		TOrderNew tOrderNew = tOrderNewMapper.queryById("412255829035991040");
 //		pushOrderDunContent(tOrderNew);
 	}
 

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

@@ -30,6 +30,7 @@ import com.goafanti.order.controller.InputTaskStopLog;
 import com.goafanti.order.enums.*;
 import com.goafanti.order.service.OrderNewService;
 import com.goafanti.order.service.OrderProjectService;
+import com.goafanti.order.service.TaskScoreService;
 import com.goafanti.organization.bo.OrganizationListOut;
 import com.goafanti.organization.bo.OutPaymentNode;
 import com.goafanti.techproject.enums.TaskState;
@@ -139,7 +140,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	private RestrictProjectMapper restrictProjectMapper;
 	@Autowired
 	private UserTransferLogMapper userTransferLogMapper;
-
+	@Autowired
+	private TaskScoreService taskScoreService;
 
 
 	@Value(value = "${upload.path}")
@@ -240,6 +242,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			customerService.updateAdminUserCount(tn.getSalesmanId(),date);
 
 		}
+		//修改用户项目统计数
+		taskScoreService.updateAdminByTid(t.getId());
 		return 1;
 	}
 
@@ -387,7 +391,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 
 
 	public TOrderNew checkDeleteSign(String orderNo) {
-		TOrderNew t=tOrderNewMapper.selectByPrimaryKey(orderNo);
+		TOrderNew t=tOrderNewMapper.queryById(orderNo);
 		if(t.getDeleteSign()==2||t.getDeleteSign()==3) throw new BusinessException(new Error(ErrorConstants.ORDER_ALREADY_REVOKE, t.getOrderNo(),""));
 		return t;
 	}
@@ -405,7 +409,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 +571,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();
@@ -825,7 +829,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 				}
 					if(flag) {
 					//如果启动催款,则新增欠款与应收款
-						TOrderNew tn=tOrderNewMapper.selectByPrimaryKey(task2.getOrderNo());
+						TOrderNew tn=tOrderNewMapper.queryById(task2.getOrderNo());
 						ob.setStatus(1);
 						ob.setStartTime(new Date());
 						newOrderDunMapper.updateByPrimaryKeySelective(ob);
@@ -946,12 +950,12 @@ 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()) {
 			TOrderBonus tb=new TOrderBonus();
-			TOrderNew t=tOrderNewMapper.selectByPrimaryKey(task.getOrderNo());
+			TOrderNew t=tOrderNewMapper.queryById(task.getOrderNo());
 			tb.setId(UUID.randomUUID().toString());
 			tb.setOrderNo(task.getOrderNo());
 			if (task.getProjectStatus()==NewProjectStatus.YTJ.getCode()) {
@@ -1577,10 +1581,12 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		tOrderTask.setSplitStatus(1);
 		tOrderTask.setSplitAid(TokenManager.getAdminId());
 		tOrderTask.setSplitTime(date);
+		tOrderTask.setProjectStatus(1);
 		tOrderTaskMapper.update(tOrderTask);
 		tOrderTask.setId(null);
 		tOrderTask.setSplitStatus(2);
 		tOrderTask.setSplitSuper(tid);
+		tOrderTask.setProjectStatus(0);
 		if (memberType!=null){
 			tOrderTask.setProcessStatus(1);
 			tOrderTask.setMemberType(memberType);
@@ -1791,7 +1797,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		} else if(x==counts) {
 			n.setProcessStatus(ProcessStatus.YQBFPZXSGLY.getCode());
 		}
-		tOrderNewMapper.updateByPrimaryKeySelective(n);
+		tOrderNewMapper.update(n);
 	}
 
 	/**
@@ -2066,9 +2072,10 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 
 	@Override
 	public void pushProjectCompleteDate() {
-		List<TOrderTask> tOrderTasks = tOrderTaskMapper.selectAll();
+//		List<TOrderTask> tOrderTasks = tOrderTaskMapper.selectAll();
+		List<TOrderTask> tOrderTasks = tOrderTaskMapper.selectTasksByTid(2960);
 		for (TOrderTask e : tOrderTasks) {
-			 updateProjectCompleteDate(e,0);
+		updateProjectCompleteDate(e,0);
 		}
 	}
 
@@ -2078,46 +2085,70 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	 * @param type =0 是批量处理会修改  =1是修改属性,外部一起修改
 	 */
 	private void  updateProjectCompleteDate(TOrderTask e ,Integer type) {
-		if (StringUtils.isNotEmpty(e.getTimeRecord())) {
 			ObjectMapper mapper = new ObjectMapper();
 			try {
-				Map map = mapper.readValue(e.getTimeRecord(), Map.class);
-
+				Map map =null;
+				if(StringUtils.isNotBlank(e.getTimeRecord()))map = mapper.readValue(e.getTimeRecord(), Map.class);
 				String[] str={"4","5","6","7","8","9","10","11","13","14","15","16","17","18","19","20","27"};
 				String date = null;
 				boolean flag = false;
 				for (String s : str) {
+					//判定时间是否为空
 					if (StringUtils.isEmpty(date)){
-						String s1 = pushStr(s, map);
-						if (s1!=null)date=s1;
-					}
-					for (String string : str) {
-                        if (string.equals(s)) {
-                            flag = true;
-                            break;
+                        String s1 = null;
+                        if (map != null) {
+                            s1 = pushStr(s, map);
+							if (s1!=null)date=s1;
                         }
 					}
-
+					if (Integer.parseInt(s)==e.getProjectStatus()) {
+						flag = true;
+						break;
+					}
 				}
 				//如果是完成则修改成完成
 				if(flag){
+					TOrderTaskDetailBo orderTaskDetail = tOrderTaskMapper.getOrderTaskDetail(e.getId());
+					Integer sort = orderTaskDetail.getSort();
 					if (type==1){
 						e.setCompleteStatus(1);
-						e.setCompleteDate(DateUtils.parseDate(date));
+						if (date !=null)e.setCompleteDate(DateUtils.parseDate(date));
+						if (sort==3||sort==6||sort==9){
+							e.setScoreStatus(1);
+							taskScoreService.updateTOrderNewByTid(e.getId());
+							taskScoreService.updateAdminByTid(e.getId());
+						}
 					}else {
 						TOrderTask t=new TOrderTask();
 						t.setId(e.getId());
 						t.setCompleteStatus(1);
-						t.setCompleteDate(DateUtils.parseDate(date));
+						if (date !=null)e.setCompleteDate(DateUtils.parseDate(date));
+						if (sort==3||sort==6||sort==9){
+							// 创建一个SimpleDateFormat对象用于解析日期字符串
+							SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+							// 解析字符串"2024-01-01"为Date对象
+							Date targetDate = sdf.parse("2024-01-01");
+							// 使用compareTo方法比较两个日期
+							int result=0;
+							if (e.getTaskDistributionTime()!=null){
+								result = targetDate.compareTo(e.getTaskDistributionTime());
+								//2024-01-01之后派单返回-1
+								if (result <0){
+									t.setScoreStatus(1);
+								}else {
+									t.setScoreStatus(0);
+								}
+							}
+							taskScoreService.updateTOrderNewByTid(e.getId());
+						}
 						tOrderTaskMapper.update(t);
 					}
 				}
-			} catch (JsonProcessingException ex) {
+			} catch (JsonProcessingException | ParseException ex) {
 				throw new RuntimeException(ex);
 			}
-		}
 
-	}
+    }
 
 	private String pushStr(String s,Map map) {
 		String date=null;

+ 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());

+ 19 - 37
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 {
@@ -1128,7 +1110,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 	@Override
 	@Transactional
 	public  int pushOrderImg(String orderNo, String imageUrl,String sign) {
-		TOrderNew tOrderNew = tOrderNewMapper.selectByPrimaryKey(orderNo);
+		TOrderNew tOrderNew = tOrderNewMapper.queryById(orderNo);
 		TOrderNew newOrder=new TOrderNew();
 		newOrder.setOrderNo(orderNo);
 		StringBuffer str=new StringBuffer();
@@ -1156,14 +1138,14 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		}else {
 			return 0;
 		}
-		return tOrderNewMapper.updateByPrimaryKeySelective(newOrder);
+		return tOrderNewMapper.update(newOrder);
 	}
 
 
 
 	@Override
 	public int deleteOrderImg(String fileName,String orderNo, String sign) {
-		TOrderNew tOrderNew = tOrderNewMapper.selectByPrimaryKey(orderNo);
+		TOrderNew tOrderNew = tOrderNewMapper.queryById(orderNo);
 		TOrderNew newOrder=new TOrderNew();
 		newOrder.setOrderNo(orderNo);
 		StringBuffer str=new StringBuffer();
@@ -1212,7 +1194,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		}else {
 			return 0;
 		}
-		return tOrderNewMapper.updateByPrimaryKeySelective(newOrder);
+		return tOrderNewMapper.update(newOrder);
 	}
 
 

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

@@ -112,7 +112,7 @@ public class OutsourceOrgServiceImpl  extends BaseMybatisDao<TOrderOutsourceMapp
 		o.setAuditTime(new Date());
 		List<String> aids = new ArrayList<>();
 		Integer type=null;
-		TOrderNew t2=tOrderNewMapper.selectByPrimaryKey(o.getOrderNo());
+		TOrderNew t2=tOrderNewMapper.queryById(o.getOrderNo());
 		//外包订单已删除
 		if (o.getType()==null||o.getType()==0) {
 			o.setType(0);
@@ -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());

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

@@ -0,0 +1,247 @@
+package com.goafanti.order.service.impl;
+
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.dao.AdminProjectStatisticsMapper;
+import com.goafanti.common.dao.TOrderNewMapper;
+import com.goafanti.common.dao.TOrderTaskMapper;
+import com.goafanti.common.dao.TaskScoreMapper;
+import com.goafanti.common.model.AdminProjectStatistics;
+import com.goafanti.common.model.TOrderNew;
+import com.goafanti.common.model.TOrderTask;
+import com.goafanti.common.model.TaskScore;
+import com.goafanti.common.utils.excel.NewExcelUtil;
+import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.order.bo.TOrderTaskBo;
+import com.goafanti.order.bo.TaskScore.InputTaskScore;
+import com.goafanti.order.bo.TaskScore.OutAdminTaskScore;
+import com.goafanti.order.service.TaskScoreService;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.List;
+
+/**
+ * 项目评分列表(TaskScore)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-09-27 11:51:57
+ */
+@Service("taskScoreService")
+public class TaskScoreServiceImpl extends BaseMybatisDao<TaskScoreMapper> implements TaskScoreService {
+    @Resource
+    private TaskScoreMapper taskScoreMapper;
+    @Resource
+    private TOrderTaskMapper tOrderTaskMapper;
+    @Resource
+    private TOrderNewMapper tOrderNewMapper;
+    @Resource
+    private AdminProjectStatisticsMapper adminProjectStatisticsMapper;
+    @Value(value = "${upload.path}")
+    private final String	uploadPath			= null;
+
+
+
+    @Override
+    public Pagination<OutAdminTaskScore> list(InputTaskScore in) {
+        return (Pagination<OutAdminTaskScore>) findPage("findAdminTaskScoreList",
+                "findAdminTaskScoreCount", in, in.getPageNo(), in.getPageSize());
+    }
+
+
+
+
+    @Override
+    public Object updateByTid(TaskScore taskScore) {
+        TaskScore taskScore2 = taskScoreMapper.queryByTid(taskScore.getTid());
+        if (taskScore2==null){
+            this.insert(taskScore);
+        }else {
+            taskScore.setId(taskScore2.getId());
+             this.taskScoreMapper.update(taskScore);
+        }
+        //修改项目评分
+        getTOrderTask(taskScore);
+        //计算项目与订单评分与状态
+        updateTOrderNewByTid(taskScore.getTid());
+        //为当事人计算评分
+        updateAdminByTid(taskScore.getTid());
+        return taskScore;
+    }
+
+    private void getTOrderTask(TaskScore taskScore) {
+        int scoreNumber = taskScore.getServiceAttitude() + taskScore.getProfessionalism() + taskScore.getPublicImage()
+                + taskScore.getResponsiveness() + taskScore.getCommunicationSkills();
+
+        if (taskScore.getMonthlyReport()!=null)scoreNumber+= taskScore.getMonthlyReport();
+        if (taskScore.getYearReport()!=null)scoreNumber+= taskScore.getYearReport();
+        TOrderTask taskTask = new TOrderTask();
+        taskTask.setId(taskScore.getTid());
+        taskTask.setScoreNumber(scoreNumber);
+        taskTask.setScoreStatus(2);
+        tOrderTaskMapper.update(taskTask);
+
+    }
+
+    /**
+     * 跟进项目编号修改管理员评分
+     * @param tid 项目编号
+     */
+    @Override
+    public void updateAdminByTid(Integer tid) {
+        List<TOrderTaskBo> tOrderTaskBos = tOrderTaskMapper.selectAdminTaskByTid(tid);
+        String aid=null;
+        //项目数量
+        int htSatCount = 0,htSatScoreCount = 0,htSatNotScoreCount = 0,
+                memberCount=0,memberScoreCount = 0,memberNotScoreCount = 0;
+        BigDecimal ht_satSum=new BigDecimal(0);
+        BigDecimal hySum=new BigDecimal(0);
+        for (TOrderTaskBo tOrderTaskBo : tOrderTaskBos) {
+            if (aid==null)aid=tOrderTaskBo.getTaskReceiver();
+            if (tOrderTaskBo.getcSort()==3||tOrderTaskBo.getcSort()==9){
+                htSatCount++;
+                if (tOrderTaskBo.getScoreStatus()==1){
+                    htSatNotScoreCount++;
+                }else if (tOrderTaskBo.getScoreStatus()==2){
+                    htSatScoreCount++;
+                ht_satSum=ht_satSum.add(new BigDecimal(tOrderTaskBo.getScoreNumber()));
+                }
+
+            }else  if (tOrderTaskBo.getcSort()==6) {
+                memberCount++;
+                if (tOrderTaskBo.getScoreStatus()==1){
+                    memberNotScoreCount++;
+                }else if (tOrderTaskBo.getScoreStatus()==2){
+                    memberScoreCount++;
+                    hySum=hySum.add(new BigDecimal(tOrderTaskBo.getScoreNumber()));
+                }
+
+            }
+        }
+        BigDecimal htSatScoreAverage = BigDecimal.ZERO;
+        BigDecimal memberScoreAverage = BigDecimal.ZERO;
+        if (htSatScoreCount>0)htSatScoreAverage=ht_satSum.divide(new BigDecimal(htSatScoreCount),2, RoundingMode.HALF_UP);
+        if (memberScoreCount>0)memberScoreAverage=hySum.divide(new BigDecimal(memberScoreCount),2, RoundingMode.HALF_UP);
+        AdminProjectStatistics adminProjectStatistics = adminProjectStatisticsMapper.queryByAid(aid);
+        AdminProjectStatistics aps=new AdminProjectStatistics();
+        aps.setAid(aid);
+        aps.setHtSatCount(htSatCount);
+        aps.setHtSatScoreAverage(htSatScoreAverage.doubleValue());
+        aps.setHtSatNotScoreCount(htSatNotScoreCount);
+        aps.setHtSatScoreCount(htSatScoreCount);
+        aps.setMemberScoreAverage(memberScoreAverage.doubleValue());
+        aps.setMemberScoreCount(memberScoreCount);
+        aps.setMemberNotScoreCount(memberNotScoreCount);
+        aps.setMemberCount(memberCount);
+        if (adminProjectStatistics==null){
+            adminProjectStatisticsMapper.insert(aps);
+        }else {
+            aps.setId(adminProjectStatistics.getId());
+            adminProjectStatisticsMapper.update(aps);
+        }
+    }
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    @Override
+    public TaskScore queryById(Integer id) {
+        return this.taskScoreMapper.queryById(id);
+    }
+
+
+    /**
+     * 新增数据
+     *
+     * @param taskScore 实例对象
+     * @return 实例对象
+     */
+    @Override
+    public TaskScore insert(TaskScore taskScore) {
+        this.taskScoreMapper.insert(taskScore);
+        return taskScore;
+    }
+
+    /**
+     * 修改数据
+     *
+     * @param taskScore 实例对象
+     * @return 实例对象
+     */
+    @Override
+    public TaskScore update(TaskScore taskScore) {
+        this.taskScoreMapper.update(taskScore);
+        return this.queryById(taskScore.getId());
+    }
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 是否成功
+     */
+    @Override
+    public boolean deleteById(Integer id) {
+        return this.taskScoreMapper.deleteById(id) > 0;
+    }
+
+    /**
+     * 根据项目编号,更新订单评分状态
+     * @param tid 项目编号
+     */
+    @Override
+    public void updateTOrderNewByTid(Integer tid) {
+        List<TOrderTask> tOrderTasks = tOrderTaskMapper.selectTasksByTid(tid);
+        if (!tOrderTasks.isEmpty()){
+            String orderNo=null;
+            int count=0;
+            int completeCount = 0;
+            int notSum = 0;
+            for (TOrderTask e : tOrderTasks) {
+                if (orderNo==null&&e.getOrderNo() != null)orderNo=e.getOrderNo();
+                if (e.getScoreStatus()==0)count++;
+                if (e.getScoreStatus()==1)notSum++;
+                if (e.getScoreStatus()==2)completeCount++;
+            }
+            TOrderNew tOrderNew = new TOrderNew();
+            tOrderNew.setOrderNo(orderNo);
+            tOrderNew.setScoreStatus(0);
+            if (notSum==0){
+                //没有未评分,全部不是是无,全部已评分是已完成
+                if (count==tOrderTasks.size()){
+                    tOrderNew.setScoreStatus(0);
+                }else if (completeCount>0){
+                    tOrderNew.setScoreStatus(3);
+                }
+            }else if (notSum>0){
+                //有未评分默认是待评分,有已完成是部分评分
+                tOrderNew.setScoreStatus(1);
+                if (completeCount>0){
+                    tOrderNew.setScoreStatus(2);
+                }
+            }
+            tOrderNewMapper.update(tOrderNew);
+        }
+
+    }
+
+    @Override
+    public TaskScore queryByTid(Integer tid) {
+        return taskScoreMapper.queryByTid(tid);
+    }
+
+    @Override
+    public Result listExport(InputTaskScore params) {
+        List<OutAdminTaskScore> list = (List<OutAdminTaskScore>) findList("findAdminTaskScoreList",params, 1, 99999);
+
+        NewExcelUtil excel = new NewExcelUtil(OutAdminTaskScore.class);
+        return excel.exportExcel(list, "人员评分列表", uploadPath);
+    }
+
+}

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

@@ -365,7 +365,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 			List<String> strings = torderNewMapper.selectByDepAndProcess(useDep.getId(), ProcessStatus.YYBZSH.getCode());
 			for (String s : strings) {
 				addOrderLog(s,OrderLogProcess.YYBZSHTG.getCode(),"运营保障审核人未设置,系统自动通过");
-				TOrderNew tOrderNew = torderNewMapper.selectByPrimaryKey(s);
+				TOrderNew tOrderNew = torderNewMapper.queryById(s);
 				TOrderNewBo order = torderNewMapper.getSaleIdByOno(s);
 				StringBuilder str = new StringBuilder();
 				TOrderNew newOrder = new TOrderNew();
@@ -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,14 +401,14 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 				TOrderNew newOrder = new TOrderNew();
 				newOrder.setOrderNo(s);
 				newOrder.setExamineName(admin.getName());
-				torderNewMapper.updateByPrimaryKeySelective(newOrder);
+				torderNewMapper.update(newOrder);
 			}
 		}
 		//关掉特批审核
 		if (in.getApproval()==0&&useDep.getApproval()==1){
 			List<String> strings = torderNewMapper.selectByDepAndProcess(useDep.getId(), ProcessStatus.YPTPSH.getCode());
 			for (String s : strings) {
-				TOrderNew tOrderNew = torderNewMapper.selectByPrimaryKey(s);
+				TOrderNew tOrderNew = torderNewMapper.queryById(s);
 				if (Objects.equals(tOrderNew.getApproval(), ApprovalNewState.TPDSH.getCode())){
 					TOrderNew newOrder=new TOrderNew();
 					List<Admin> admins = adminMapper.selectAdminByRoleType(AFTConstants.TECH_ADMIN);
@@ -420,20 +420,20 @@ 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(),"特批审核关闭,系统自动通过");
 				}
 			}
 		} else if (in.getApprovalAid().equals(useDep.getApprovalAid())) {
 			List<String> strings = torderNewMapper.selectByDepAndProcess(useDep.getId(), ProcessStatus.YPTPSH.getCode());
 			for (String s : strings) {
-				TOrderNew tOrderNew = torderNewMapper.selectByPrimaryKey(s);
+				TOrderNew tOrderNew = torderNewMapper.queryById(s);
 				if (Objects.equals(tOrderNew.getApproval(), ApprovalNewState.TPDSH.getCode())){
 					TOrderNewBo order = torderNewMapper.getSaleIdByOno(s);
 					TOrderNew newOrder=new TOrderNew();
 					newOrder.setOrderNo(s);
 					newOrder.setExamineName(order.getApprovalName());
-					torderNewMapper.updateByPrimaryKeySelective(newOrder);
+					torderNewMapper.update(newOrder);
 				}
 			}
 
@@ -500,7 +500,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 			//推送订单流程
 			addOrderLog(s,OrderLogProcess.XMZJSH.getCode(),type==0?"部门修改技术总监为空,系统自动通过":"部门修改财务复审为空,系统自动通过");
 			StringBuilder str = new StringBuilder();
-			TOrderNew tOrderNew = torderNewMapper.selectByPrimaryKey(s);
+			TOrderNew tOrderNew = torderNewMapper.queryById(s);
 			TOrderNewBo order = torderNewMapper.getSaleIdByOno(s);
 			TOrderNew newOrder = new TOrderNew();
 			newOrder.setOrderNo(s);
@@ -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);
 		}
 
 	}

+ 4 - 4
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -128,7 +128,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		}
 		publicReleaseMapper.insertSelective(in);
 		if (in.getType()==1&&in.getOrderNo()!=null){
-			TOrderNew tOrderNew = tOrderNewMapper.selectByPrimaryKey(in.getOrderNo());
+			TOrderNew tOrderNew = tOrderNewMapper.queryById(in.getOrderNo());
 			orderNewService.pushOrderPublicReleaseCount(tOrderNew);
 		}
 		addPRD(in, users, str, prdList);
@@ -321,7 +321,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			}
 			publicReleaseMapper.update(in);
 		}else {
-			TOrderNew tOrderNew = tOrderNewMapper.selectByPrimaryKey(in.getOrderNo());
+			TOrderNew tOrderNew = tOrderNewMapper.queryById(in.getOrderNo());
 			String salesmanId = tOrderNew.getSalesmanId();
 			Admin a = adminMapper.selectByPrimaryKey(salesmanId);
 			addPublicExamine(in.getId(),a);
@@ -516,7 +516,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		publicReleaseLogMapper.insertSelective(log);
 		publicReleaseMapper.update(in);
 		if (in.getOrderNo()!=null){
-			TOrderNew tOrderNew = tOrderNewMapper.selectByPrimaryKey(in.getOrderNo());
+			TOrderNew tOrderNew = tOrderNewMapper.queryById(in.getOrderNo());
 			orderNewService.pushOrderPublicReleaseCount(tOrderNew);
 		}
 		return 1;
@@ -2600,7 +2600,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			}
 		}
 		data.setDurationMax(useOyd.getMaxDuration());
-		TOrderNew tOrderNew = tOrderNewMapper.selectByPrimaryKey(in.getOrderNo());
+		TOrderNew tOrderNew = tOrderNewMapper.queryById(in.getOrderNo());
 		List<TTaskMember> tTaskMembers = tTaskMemberMapper.selectByOrderNo(tOrderNew.getOrderNo());
 		String amountName=null;
 		String amountType=null;

+ 2 - 2
src/main/resources/props/config_local.properties

@@ -1,8 +1,8 @@
 dev.name=local
 jdbc.driverClassName=com.mysql.jdbc.Driver
 
-#static.host=//static.jishutao.com/1.3.25
-static.host=//172.16.1.187/1.3.25
+#static.host=//static.jishutao.com/1.3.26
+static.host=//172.16.1.187/1.3.26
 
 #jdbc.url=jdbc\:mysql://localhost:3306/aft20240430?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -1,5 +1,5 @@
 dev.name=test
-static.host=//static.jishutao.com/1.3.25
+static.host=//static.jishutao.com/1.3.26
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 jdbc.url=jdbc:mysql://127.0.0.1:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false

+ 0 - 47
src/main/webapp/WEB-INF/views/common.html

@@ -22,53 +22,6 @@
 			</div>
 			<div class="logo_right"></div>
 			<div class="nav">
-				<ul>
-					<li th:classappend="${mainM=='service'}? 'active'"><a
-						th:href="${basePath + '/portal/service/serviceIndex.html'}">科技服务</a>
-						<img th:src="${portalHost+'/img/hot.png'}" />
-						<ol class="subnavigation">
-							<li><a th:href="${basePath + '/portal/service/highTechCognizance.html'}">高企认定</a>
-							</li>
-							<li><a th:href="${basePath + '/portal/service/propertyRight.html'}">知识产权</a>
-							</li>
-						</ol></li>
-					<li th:classappend="${mainM=='technologyTrading'}? 'active'">
-						<a th:href="${basePath + '/portal/technologyTrading/index.html'}">技术交易</a>
-						<ol class="subnavigation">
-							<li><a th:href="${basePath + '/portal/technologyTrading/achievement.html'}">专利产品</a>
-							</li>
-							<li><a th:href="${basePath + '/portal/technologyTrading/achievement.html'}">技术成果</a>
-							</li>
-							<li><a th:href="${basePath + '/portal/technologyTrading/demand.html'}">技术需求</a>
-							</li>
-							<li><a th:href="${basePath + '/portal/technologyTrading/assessMent.html'}">技术评估</a>
-							</li>
-						</ol>
-					</li>
-					<li th:classappend="${mainM=='thinkTank'}? 'active'"><a
-						th:href="${basePath + '/portal/thinkTank/index.html'}">智库咨询</a>
-						<ol class="subnavigation">
-							<li><a
-								th:href="${basePath + '/portal/thinkTank/policyList.html'}">智政</a>
-							</li>
-							<li><a
-								th:href="${basePath + '/portal/thinkTank/index.html#zizone'}">智者</a>
-							</li>
-						</ol></li>
-					<!-- <li><a th:href="${basePath + '/portal/financial/index.html'}">科技金融</a>
-						<ol class="subnavigation">
-							<li><a
-								th:href="${basePath + '/portal/financial/investmentInstitution.html'}">投资机构</a>
-							</li>
-						</ol></li> -->
-					<li><a th:href="${basePath + '/portal/aboutUs.html'}">关于公司</a>
-						<ol class="subnavigation">
-							<li><a
-								th:href="${basePath + '/portal/contactUs.html'}">联系我们</a>
-							</li>
-					</ol></li>
-					<!-- <li><a href="#">科技活动</a></li> <li><a href="#">平台共建</a></li> 	-->
-				</ul>
 			</div>
 			<div class="nav_right" th:if="${!isLogin}">
 				<a th:href="${basePath + '/user/signIn.html'}"> <img