anderx лет назад: 4
Родитель
Сommit
458b526d61
32 измененных файлов с 532 добавлено и 432 удалено
  1. 1 1
      GeneratorConfig.xml
  2. 1 0
      src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java
  3. 5 0
      src/main/java/com/goafanti/admin/bo/NoticeBo.java
  4. 3 4
      src/main/java/com/goafanti/admin/controller/AdminNoticeApiController.java
  5. 1 1
      src/main/java/com/goafanti/admin/service/NoticeService.java
  6. 36 45
      src/main/java/com/goafanti/admin/service/impl/NoticeServiceImpl.java
  7. 3 1
      src/main/java/com/goafanti/common/dao/NoticeMapper.java
  8. 6 6
      src/main/java/com/goafanti/common/dao/UserServiceFollowMapper.java
  9. 6 6
      src/main/java/com/goafanti/common/dao/UserServiceMapper.java
  10. 88 6
      src/main/java/com/goafanti/common/enums/NoticeTypes.java
  11. 14 166
      src/main/java/com/goafanti/common/mapper/NoticeMapper.xml
  12. 38 13
      src/main/java/com/goafanti/common/mapper/UserServiceFollowMapper.xml
  13. 57 32
      src/main/java/com/goafanti/common/mapper/UserServiceMapper.xml
  14. 86 38
      src/main/java/com/goafanti/common/model/UserService.java
  15. 83 35
      src/main/java/com/goafanti/common/model/UserServiceFollow.java
  16. 5 8
      src/main/java/com/goafanti/common/task/OrderDunTask.java
  17. 30 22
      src/main/java/com/goafanti/common/task/PatentTask.java
  18. 4 4
      src/main/java/com/goafanti/common/task/ReleaseUserTask.java
  19. 24 2
      src/main/java/com/goafanti/common/utils/AsyncUtils.java
  20. 4 3
      src/main/java/com/goafanti/contract/service/impl/ContractServiceImpl.java
  21. 0 1
      src/main/java/com/goafanti/copyright/service/impl/CopyrightInfoServiceImpl.java
  22. 0 3
      src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java
  23. 7 8
      src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java
  24. 2 5
      src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java
  25. 1 4
      src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java
  26. 3 3
      src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java
  27. 2 6
      src/main/java/com/goafanti/organization/service/impl/ThirdPartyCompanyServiceImpl.java
  28. 0 1
      src/main/java/com/goafanti/patent/service/impl/PatentInfoServiceImpl.java
  29. 0 1
      src/main/java/com/goafanti/techproject/service/impl/TechProjectServiceImpl.java
  30. 16 0
      src/main/java/com/goafanti/user/bo/OutOrderUserService.java
  31. 3 4
      src/main/java/com/goafanti/user/service/impl/OrganizationIdentityServiceImpl.java
  32. 3 3
      src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java

+ 1 - 1
GeneratorConfig.xml

@@ -43,7 +43,7 @@
     <property name="enableSubPackages" value="false"/>
      <property name="nullCatalogMeansCurrent" value="true"/>
     </javaClientGenerator>
-    <table schema="aft" tableName="notice"
+    <table schema="aft" tableName="user_service_follow"
 	enableCountByExample="false" enableUpdateByExample="false"
 	enableDeleteByExample="false" enableSelectByExample="false"
 	selectByExampleQueryId="false" enableSelectByPrimaryKey="true"

+ 1 - 0
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -95,6 +95,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 	private AchievementInterestMapper	achievementInterestMapper;
 	@Autowired
 	private UserMapper					userMapper;
+	
 
 	private static final Logger				logger	= LoggerFactory.getLogger(AchievementServiceImpl.class);
 

+ 5 - 0
src/main/java/com/goafanti/admin/bo/NoticeBo.java

@@ -4,6 +4,11 @@ import com.goafanti.common.model.Notice;
 
 public class NoticeBo extends Notice {
 
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
 	private String	unitName;
 
 	private String	principle;

+ 3 - 4
src/main/java/com/goafanti/admin/controller/AdminNoticeApiController.java

@@ -10,8 +10,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.goafanti.admin.service.NoticeService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.controller.CertifyApiController;
-import com.goafanti.common.utils.StringUtils;
-import com.goafanti.core.shiro.token.TokenManager;
+
 @RestController
 @RequestMapping(value = "/api/admin/notice")
 public class AdminNoticeApiController extends CertifyApiController{
@@ -47,9 +46,9 @@ public class AdminNoticeApiController extends CertifyApiController{
 	 * @return
 	 */
 	@RequestMapping(value = "/readed", method = RequestMethod.GET)
-	public Result readed(Integer pageNo, Integer pageSize){
+	public Result readed(Integer type,Integer pageNo, Integer pageSize){
 		Result res = new Result();
-		res.setData(noticeService.ListReadedNoticeByAid(pageNo, pageSize, TokenManager.getAdminId()));
+		res.setData(noticeService.ListReadedNoticeByAid(type,pageNo, pageSize));
 		return res;
 	}
 }

+ 1 - 1
src/main/java/com/goafanti/admin/service/NoticeService.java

@@ -10,7 +10,7 @@ public interface NoticeService {
 
 	List<Map<String, Object>> updateListUnreadNoticeByAid();
 
-	Pagination<NoticeBo> ListReadedNoticeByAid(Integer pNo, Integer pSize, String adminId);
+	Pagination<NoticeBo> ListReadedNoticeByAid(Integer type, Integer pNo, Integer pageSize);
 
 	int findUnreadNoticeCount();
 

+ 36 - 45
src/main/java/com/goafanti/admin/service/impl/NoticeServiceImpl.java

@@ -2,7 +2,6 @@ package com.goafanti.admin.service.impl;
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -11,12 +10,8 @@ import org.springframework.stereotype.Service;
 
 import com.goafanti.admin.bo.NoticeBo;
 import com.goafanti.admin.service.NoticeService;
-import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.dao.NoticeMapper;
-import com.goafanti.common.enums.NoticeStatus;
-import com.goafanti.common.model.Admin;
-import com.goafanti.common.model.Notice;
+import com.goafanti.common.enums.NoticeTypes;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
@@ -25,66 +20,62 @@ import com.goafanti.core.shiro.token.TokenManager;
 public class NoticeServiceImpl extends BaseMybatisDao<NoticeMapper> implements NoticeService {
 	@Autowired
 	private NoticeMapper noticeMapper;
-	@Autowired
-	private AdminMapper adminMapper;
 
 	@Override
 	public List<Map<String, Object>> updateListUnreadNoticeByAid() {
 		List<Map<String, Object>> list = new ArrayList<>();
 		List<NoticeBo> nl = noticeMapper.findUnreadNoticeListByPage(TokenManager.getAdminId());
 		List<String> dl = new ArrayList<String>();
-		for (NoticeBo n : nl) {
-			//添加已读
-			dl.add(n.getId());
-			
-			//0专利提醒
-			if (n.getType()==0) {
+
+		for (int i = NoticeTypes.getCount(); i >= 0; i--) {
+			Map<String, Object> map = new HashMap<String, Object>();
+			List<NoticeBo> cffk = new ArrayList<NoticeBo>();
+			for (NoticeBo n : nl) {
+				// 0专利提醒
+				if (n.getType() == i) {
+					cffk.add(n);
+				} else if (n.getType() == i) {
+					cffk.add(n);
+				} else if (n.getType() == i) {
+					cffk.add(n);
+				} else if (n.getType() == i) {
+					cffk.add(n);
+				} else if (n.getType() == i) {
+					cffk.add(n);
+				} else if (n.getType() == i) {
+					cffk.add(n);
+				} else if (n.getType() == i) {
+					cffk.add(n);
+				}
 			}
-			if (n.getNoticeType()==NoticeStatus.TASK_PATENT_ERROR.getCode()||
-					n.getNoticeType()==NoticeStatus.TASK_PATENT_REMIND.getCode()) {
+			map.put("name", NoticeTypes.getValueByCode(i));
+			map.put("id", i);
+			map.put("list", cffk);
+			list.add(map);
+		}
+		if (!nl.isEmpty()) {
+			for (NoticeBo n : nl) {
+				// 添加已读
+				dl.add(n.getId());
 			}
+			noticeMapper.batchUpdateUnreaded(dl);
 		}
-//		Map<String,Object> m0=new HashMap<>();
-//		m0.put("type", 0);
-//		m0.put("name", "专利提醒");
-//		m0.put("list", l0);
-//		Map<String,Object> m1=new HashMap<>();
-//		m1.put("type", 1);
-//		m1.put("name", "客户释放");
-//		m1.put("list", l1);
-//		Map<String,Object> m2=new HashMap<>();
-//		m2.put("type", 2);
-//		m2.put("name", "限时跟进");
-//		m2.put("list", l2);
-//		Map<String,Object> m3=new HashMap<>();
-//		m3.put("type", 3);
-//		m3.put("name", "最新审批");
-//		m3.put("list", l3);
-//		list.add(m0);
-//		list.add(m1);
-//		list.add(m2);
-//		list.add(m3);
-		
-		noticeMapper.batchUpdateUnreaded(dl);
-
 		return list;
 	}
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<NoticeBo> ListReadedNoticeByAid(Integer pageNo, Integer pageSize, String aid) {
+	public Pagination<NoticeBo> ListReadedNoticeByAid(Integer type, Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<>();
-		params.put("aid", aid);
-
+		params.put("aid", TokenManager.getAdminId());
+		params.put("type", type==null?0:type);
 		return (Pagination<NoticeBo>) findPage("findReadedNoticeListByPage", "findReadedNoticeCount", params, pageNo,
 				pageSize);
 	}
 
 	@Override
 	public int findUnreadNoticeCount() {
-		String aid = null;
-			aid = TokenManager.getAdminId();
-		return noticeMapper.selectUnreadedCount(aid);
+		return noticeMapper.selectUnreadedCount(TokenManager.getAdminId());
 	}
 
 

+ 3 - 1
src/main/java/com/goafanti/common/dao/NoticeMapper.java

@@ -2,6 +2,8 @@ package com.goafanti.common.dao;
 
 import java.util.List;
 
+import org.apache.ibatis.annotations.Param;
+
 import com.goafanti.admin.bo.NoticeBo;
 import com.goafanti.common.model.Notice;
 
@@ -51,5 +53,5 @@ public interface NoticeMapper {
 
 	void insertBatch(List<Notice> notice);
 
-	List<NoticeBo> findUnreadNoticeListByPage(String aid);
+	List<NoticeBo> findUnreadNoticeListByPage(@Param("aid") String aid);
 }

+ 6 - 6
src/main/java/com/goafanti/common/dao/UserServiceFollowMapper.java

@@ -9,37 +9,37 @@ public interface UserServiceFollowMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_service_follow
-	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_service_follow
-	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
 	 */
 	int insert(UserServiceFollow record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_service_follow
-	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
 	 */
 	int insertSelective(UserServiceFollow record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_service_follow
-	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
 	 */
 	UserServiceFollow selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_service_follow
-	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
 	 */
 	int updateByPrimaryKeySelective(UserServiceFollow record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_service_follow
-	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
 	 */
 	int updateByPrimaryKey(UserServiceFollow record);
 

+ 6 - 6
src/main/java/com/goafanti/common/dao/UserServiceMapper.java

@@ -6,37 +6,37 @@ public interface UserServiceMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_service
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_service
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	int insert(UserService record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_service
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	int insertSelective(UserService record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_service
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	UserService selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_service
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	int updateByPrimaryKeySelective(UserService record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_service
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	int updateByPrimaryKey(UserService record);
 

+ 88 - 6
src/main/java/com/goafanti/common/enums/NoticeTypes.java

@@ -3,15 +3,70 @@ package com.goafanti.common.enums;
 import java.util.HashMap;
 import java.util.Map;
 
-public enum NoticeTypes {
 
-//	通知分类 0专利提醒 1客户释放 2限时跟进 3最新审批
-	ZLTX(0,"专利提醒"),
-	KHSF(0,"客户释放"),
-	XSGJ(0,"限时跟进"),
-	ZXSP(0,"最新审批"),
+public enum NoticeTypes {
+	// 0其他 1专利提醒 2订单审核 3客户释放 4限时跟进 5催款\付款 6订单开票
+	/** 专利提醒 */
+	ZLTX(1,"专利提醒"),
+	/** 订单审核 */
+	DDSH(2,"订单审核"),
+	/** 客户释放 */
+	KHSF(3,"客户释放"),
+	/** 限时跟进 */
+	XSGJ(4,"限时跟进"),
+	/** 催款\付款 */
+	CKFK(5,"催款\\付款"),
+	/** 订单开票 */
+	DDKP(6,"订单开票"),
 	ELSE(0,"其他");
 	
+	/**
+	 * 跟进通知类型获取大分类
+	 * @param i
+	 * @return
+	 */
+	public static Integer getType(Integer i) {
+		if (i == NoticeStatus.TASK_PATENT_ERROR.getCode() || i == NoticeStatus.TASK_PATENT_REMIND.getCode()) {
+			return 1;
+		} else if (i == NoticeStatus.ORDER_CHANGE_ADD.getCode() || i == NoticeStatus.ORDER_CHANGE_UDPATE.getCode()
+				|| i == NoticeStatus.ORDER_BACK.getCode() || i == NoticeStatus.ORDER_REFUND.getCode()
+				|| i == NoticeStatus.ORDER_REFUND_REFUSE.getCode() || i == NoticeStatus.ORDER_CHANGE_YES.getCode()
+				|| i == NoticeStatus.ORDER_CHANGE_NO.getCode() || i == NoticeStatus.ORDER_CHANGE_END.getCode()
+				|| i == NoticeStatus.ORDER_CHANGE_START.getCode() || i == NoticeStatus.ORDER_START.getCode()
+				|| i == NoticeStatus.ORDER_APPROVA_YES.getCode() || i == NoticeStatus.ORDER_APPROVA_NO.getCode()
+				|| i == NoticeStatus.ORDER_OUTSOURCE_NO.getCode() || i == NoticeStatus.ORDER_OUTSOURCE_YES.getCode()
+				|| i == NoticeStatus.ORDER_YES.getCode() || i == NoticeStatus.ORDER_NO.getCode()
+				|| i == NoticeStatus.ORDER_TASK_TO.getCode() || i == NoticeStatus.PROJECT_OUTSOURCE_START.getCode()
+				|| i == NoticeStatus.PROJECT_OUTSOURCE_YES.getCode()|| i == NoticeStatus.PROJECT_OUTSOURCE_NO.getCode()){
+			return 2;
+		}else if(i==NoticeStatus.CUSTOMER_LOSE30.getCode()||
+				i==NoticeStatus.CUSTOMER_LOSE270.getCode()||
+				i==NoticeStatus.CUSTOMER_CHENNEL_LOSE.getCode()||
+				i==NoticeStatus.CUSTOMER_CHENNEL_RECOVERY.getCode()
+				) {
+			return 3;
+		}else if(i==NoticeStatus.CUSTOMER_PRIVATE_REMINDER.getCode()||
+				i==NoticeStatus.CUSTOMER_LOSE_REMINDER.getCode()) {
+			return 4;
+		}else if(i==NoticeStatus.ORDER_DUN.getCode()||
+				i==NoticeStatus.ORDER_ARREARS_DUN.getCode()||
+				i==NoticeStatus.PAYMENT_DUN.getCode()||
+				i==NoticeStatus.PAYMENT_NODE.getCode()||
+				i==NoticeStatus.PAYMENT_NO.getCode()||
+				i==NoticeStatus.PAYMENT_YES.getCode()||
+				i==NoticeStatus.PAYMENT_COMPLETE.getCode()) {
+			return 5;
+		}else if(i==NoticeStatus.ORDER_INVPICE_START.getCode()||
+				i==NoticeStatus.ORDER_INVPICE_YES.getCode()||
+				i==NoticeStatus.ORDER_INVPICE_NO.getCode()||
+				i==NoticeStatus.ORDER_INVPICE_APPROVA_YES.getCode()||
+				i==NoticeStatus.ORDER_INVPICE_APPROVA_NO.getCode()||
+				i==NoticeStatus.ORDER_INVPICE_END.getCode()) {
+			return 6;
+		}
+		return 0;
+	}
+	
 	private static Map<Integer, NoticeTypes> status = new HashMap<Integer, NoticeTypes>();
 	
 	static {
@@ -19,8 +74,35 @@ public enum NoticeTypes {
 			status.put(value.getCode(), value);
 		}
 	}
+	public static NoticeTypes getStatus(Integer code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return ELSE;
+	}
+	
+	public static String getValueByCode(Integer code){
+        for(NoticeTypes NoticeTypes:NoticeTypes.values()){
+            if(code.equals(NoticeTypes.getCode())){
+                return NoticeTypes.getDesc();
+            }
+        }
+        return  ELSE.getDesc();
+    }
+	
+	public static Integer getCount(){
+		Integer count=0;
+        for(NoticeTypes x:NoticeTypes.values()){
+         if(x!=null)count++;
+        }
+        return  --count;
+    }
 	
 	
+	public static boolean containsType(Integer code) {
+		return status.containsKey(code);
+	}
+	
 	private String desc;
 	private Integer code;
 	

+ 14 - 166
src/main/java/com/goafanti/common/mapper/NoticeMapper.xml

@@ -200,168 +200,10 @@
       `type` = #{type,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
   </update>
-  <resultMap id="BaseResultMap" type="com.goafanti.common.model.Notice">
-    <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="aid" jdbcType="VARCHAR" property="aid" />
-    <result column="notice_type" jdbcType="INTEGER" property="noticeType" />
-    <result column="content" jdbcType="VARCHAR" property="content" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="readed" jdbcType="INTEGER" property="readed" />
-    <result column="uid" jdbcType="VARCHAR" property="uid" />
-    <result column="pid" jdbcType="VARCHAR" property="pid" />
-    <result column="rid" jdbcType="VARCHAR" property="rid" />
-    <result column="year" jdbcType="INTEGER" property="year" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    id, aid, notice_type, content, create_time, readed, uid, pid, rid, year
-  </sql>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from notice
-    where id = #{id,jdbcType=VARCHAR}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from notice
-    where id = #{id,jdbcType=VARCHAR}
-  </delete>
-  <insert id="insert" parameterType="com.goafanti.common.model.Notice">
-    insert into notice (id, aid, notice_type, 
-      content, create_time, readed, uid, pid, rid, year
-      )
-    values (#{id,jdbcType=VARCHAR}, #{aid,jdbcType=VARCHAR}, #{noticeType,jdbcType=INTEGER}, 
-      #{content,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{readed,jdbcType=INTEGER},
-      #{uid,jdbcType=VARCHAR}, #{pid,jdbcType=VARCHAR}, #{rid,jdbcType=VARCHAR}, #{year,jdbcType=INTEGER}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.goafanti.common.model.Notice">
-    insert into notice
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="aid != null">
-        aid,
-      </if>
-      <if test="noticeType != null">
-        notice_type,
-      </if>
-      <if test="content != null">
-        content,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="readed != null">
-        readed,
-      </if>
-      
-       <if test="uid != null">
-        uid,
-      </if>
-      <if test="pid != null">
-        pid,
-      </if>
-      
-      <if test="rid != null">
-        rid,
-      </if>
-      
-      <if test="year != null">
-        year,
-      </if>
-      
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=VARCHAR},
-      </if>
-      <if test="aid != null">
-        #{aid,jdbcType=VARCHAR},
-      </if>
-      <if test="noticeType != null">
-        #{noticeType,jdbcType=INTEGER},
-      </if>
-      <if test="content != null">
-        #{content,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="readed != null">
-        #{readed,jdbcType=INTEGER},
-      </if>
-      
-      <if test="uid != null">
-        #{uid,jdbcType=VARCHAR},
-      </if>
-      <if test="pid != null">
-        #{pid,jdbcType=VARCHAR},
-      </if>
-      
-      <if test="rid != null">
-        #{rid,jdbcType=VARCHAR},
-      </if>
-      
-       <if test="year != null">
-        #{year,jdbcType=INTEGER},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.Notice">
-    update notice
-    <set>
-      <if test="aid != null">
-        aid = #{aid,jdbcType=VARCHAR},
-      </if>
-      <if test="noticeType != null">
-        notice_type = #{noticeType,jdbcType=INTEGER},
-      </if>
-      <if test="content != null">
-        content = #{content,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="readed != null">
-        readed = #{readed,jdbcType=INTEGER},
-      </if>
-      
-      <if test="uid != null">
-        uid = #{uid,jdbcType=VARCHAR},
-      </if>
-      <if test="pid != null">
-        pid = #{pid,jdbcType=VARCHAR},
-      </if>
-      
-      <if test="rid != null">
-        rid = #{rid,jdbcType=VARCHAR},
-      </if>
-      
-       <if test="year != null">
-        year = #{year,jdbcType=INTEGER},
-      </if>
-    </set>
-    where id = #{id,jdbcType=VARCHAR}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.Notice">
-    update notice
-    set aid = #{aid,jdbcType=VARCHAR},
-      notice_type = #{noticeType,jdbcType=INTEGER},
-      content = #{content,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      readed = #{readed,jdbcType=INTEGER},
-      
-      uid = #{uid,jdbcType=VARCHAR},
-      pid = #{pid,jdbcType=VARCHAR},
-      
-      rid = #{rid,jdbcType=VARCHAR},
-      
-      year = #{year,jdbcType=INTEGER}
-    where id = #{id,jdbcType=VARCHAR}
-  </update>
+
+  
   
-  <select id="findUnreadNoticeListByPage" parameterType="java.lang.String" resultType="com.goafanti.admin.bo.NoticeBo">
+  <select id="findUnreadNoticeListByPage"  resultType="com.goafanti.admin.bo.NoticeBo">
     select n.id, n.aid, n.uid, n.notice_type as noticeType, n.content, n.create_time as createTime, n.type,
 		oi.unit_name as unitName, n.rid, a.name as principle, n.readed, n.year
 		from notice n 
@@ -369,7 +211,7 @@
 		LEFT JOIN admin a on a.id = n.pid 
     where n.readed = 0 
     <if test="aid != null">
-    	and n.aid = #{aid,jdbcType=VARCHAR}
+    	and n.aid = #{aid}
     </if>
     order by n.create_time desc
   </select>
@@ -383,7 +225,10 @@
 		LEFT JOIN admin a on a.id = n.pid 
     where n.readed = 1 
     <if test="aid != null">
-   		 and n.aid = #{aid,jdbcType=VARCHAR}
+   		 and n.aid = #{aid}
+    </if>
+    <if test="type != null">
+   		 and n.type = #{type}
     </if>
     order by n.create_time desc
     <if test="page_sql!=null">
@@ -396,7 +241,10 @@
  	 from notice n
     where n.readed = 1 
     <if test="aid != null">
-    and n.aid = #{aid,jdbcType=VARCHAR}
+    and n.aid = #{aid}
+    </if>
+    <if test="type != null">
+   		 and n.type = #{type}
     </if>
   </select>
   
@@ -416,14 +264,14 @@
   </update>
   
   <insert id="insertBatch" parameterType="com.goafanti.common.model.Notice">
-    insert into notice (id, aid, notice_type, content, create_time, readed, uid, pid, rid, year)
+    insert into notice (id, aid, notice_type, content, create_time, readed, uid, pid, rid, year,type)
     values 
     <foreach collection="list" index="index" item="item" separator=",">
       (
       	#{item.id,jdbcType=VARCHAR}, #{item.aid,jdbcType=VARCHAR}, #{item.noticeType,jdbcType=INTEGER},
       	#{item.content,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, #{item.readed,jdbcType=INTEGER},
       	#{item.uid,jdbcType=VARCHAR}, #{item.pid,jdbcType=VARCHAR}, #{item.rid,jdbcType=VARCHAR},
-      	#{item.year,jdbcType=INTEGER}
+      	#{item.year,jdbcType=INTEGER},#{item.type,jdbcType=INTEGER}
       )
     </foreach>
   </insert>

+ 38 - 13
src/main/java/com/goafanti/common/mapper/UserServiceFollowMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue May 18 15:33:51 CST 2021.
+      This element was generated on Fri May 28 13:37:12 CST 2021.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="uid" jdbcType="VARCHAR" property="uid" />
@@ -18,21 +18,23 @@
     <result column="sign_project" jdbcType="VARCHAR" property="signProject" />
     <result column="remarks" jdbcType="VARCHAR" property="remarks" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="tech_satisfaction" jdbcType="INTEGER" property="techSatisfaction" />
+    <result column="business_satisfaction" jdbcType="INTEGER" property="businessSatisfaction" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue May 18 15:33:51 CST 2021.
+      This element was generated on Fri May 28 13:37:12 CST 2021.
     -->
     id, `uid`, aid, add_wechat, wechat, renewal, renewal_time, sign_project_id, sign_project, 
-    remarks, create_time
+    remarks, create_time, tech_satisfaction, business_satisfaction
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue May 18 15:33:51 CST 2021.
+      This element was generated on Fri May 28 13:37:12 CST 2021.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -43,7 +45,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue May 18 15:33:51 CST 2021.
+      This element was generated on Fri May 28 13:37:12 CST 2021.
     -->
     delete from user_service_follow
     where id = #{id,jdbcType=INTEGER}
@@ -52,22 +54,24 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue May 18 15:33:51 CST 2021.
+      This element was generated on Fri May 28 13:37:12 CST 2021.
     -->
     insert into user_service_follow (id, `uid`, aid, 
       add_wechat, wechat, renewal, 
       renewal_time, sign_project_id, sign_project, 
-      remarks, create_time)
+      remarks, create_time, tech_satisfaction, 
+      business_satisfaction)
     values (#{id,jdbcType=INTEGER}, #{uid,jdbcType=VARCHAR}, #{aid,jdbcType=VARCHAR}, 
       #{addWechat,jdbcType=INTEGER}, #{wechat,jdbcType=VARCHAR}, #{renewal,jdbcType=INTEGER}, 
       #{renewalTime,jdbcType=TIMESTAMP}, #{signProjectId,jdbcType=VARCHAR}, #{signProject,jdbcType=VARCHAR}, 
-      #{remarks,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP})
+      #{remarks,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{techSatisfaction,jdbcType=INTEGER}, 
+      #{businessSatisfaction,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.UserServiceFollow">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue May 18 15:33:51 CST 2021.
+      This element was generated on Fri May 28 13:37:12 CST 2021.
     -->
     insert into user_service_follow
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -104,6 +108,12 @@
       <if test="createTime != null">
         create_time,
       </if>
+      <if test="techSatisfaction != null">
+        tech_satisfaction,
+      </if>
+      <if test="businessSatisfaction != null">
+        business_satisfaction,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -139,13 +149,19 @@
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="techSatisfaction != null">
+        #{techSatisfaction,jdbcType=INTEGER},
+      </if>
+      <if test="businessSatisfaction != null">
+        #{businessSatisfaction,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.UserServiceFollow">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue May 18 15:33:51 CST 2021.
+      This element was generated on Fri May 28 13:37:12 CST 2021.
     -->
     update user_service_follow
     <set>
@@ -179,6 +195,12 @@
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="techSatisfaction != null">
+        tech_satisfaction = #{techSatisfaction,jdbcType=INTEGER},
+      </if>
+      <if test="businessSatisfaction != null">
+        business_satisfaction = #{businessSatisfaction,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -186,7 +208,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue May 18 15:33:51 CST 2021.
+      This element was generated on Fri May 28 13:37:12 CST 2021.
     -->
     update user_service_follow
     set `uid` = #{uid,jdbcType=VARCHAR},
@@ -198,13 +220,16 @@
       sign_project_id = #{signProjectId,jdbcType=VARCHAR},
       sign_project = #{signProject,jdbcType=VARCHAR},
       remarks = #{remarks,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP}
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      tech_satisfaction = #{techSatisfaction,jdbcType=INTEGER},
+      business_satisfaction = #{businessSatisfaction,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="listUseServiceFollow" resultType="com.goafanti.user.bo.OutUserServiceFollow">
 	select a.id, a.`uid`, a.aid, a.add_wechat addWechat, a.wechat, renewal, a.renewal_time renewalTime, a.sign_project_id signProjectId,
  a.sign_project signProject,  a.create_time createTime ,date_format(a.renewal_time,'%Y-%m-%d') as renewalTimes,
- date_format(a.create_time,'%Y-%m-%d %H:%i:%S') as createTimes,a.remarks,b.name adminName
+ date_format(a.create_time,'%Y-%m-%d %H:%i:%S') as createTimes,a.remarks,b.name adminName,a.tech_satisfaction techSatisfaction,
+ a.business_satisfaction businessSatisfaction
   from user_service_follow a left join admin b on a.aid =b.id
     where uid = #{uid}
     order by a.create_time desc

+ 57 - 32
src/main/java/com/goafanti/common/mapper/UserServiceMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue May 18 15:33:59 CST 2021.
+      This element was generated on Fri May 28 13:36:56 CST 2021.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="uid" jdbcType="VARCHAR" property="uid" />
@@ -19,21 +19,23 @@
     <result column="new_time" jdbcType="TIMESTAMP" property="newTime" />
     <result column="remarks" jdbcType="VARCHAR" property="remarks" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="tech_satisfaction" jdbcType="INTEGER" property="techSatisfaction" />
+    <result column="business_satisfaction" jdbcType="INTEGER" property="businessSatisfaction" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue May 18 15:33:59 CST 2021.
+      This element was generated on Fri May 28 13:36:56 CST 2021.
     -->
     id, `uid`, aid, add_wechat, wechat, renewal, renewal_time, sign_project, sign_project_id, 
-    new_time, remarks, create_time
+    new_time, remarks, create_time, tech_satisfaction, business_satisfaction
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue May 18 15:33:59 CST 2021.
+      This element was generated on Fri May 28 13:36:56 CST 2021.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -44,7 +46,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue May 18 15:33:59 CST 2021.
+      This element was generated on Fri May 28 13:36:56 CST 2021.
     -->
     delete from user_service
     where id = #{id,jdbcType=INTEGER}
@@ -53,24 +55,24 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue May 18 15:33:59 CST 2021.
+      This element was generated on Fri May 28 13:36:56 CST 2021.
     -->
     insert into user_service (id, `uid`, aid, 
       add_wechat, wechat, renewal, 
       renewal_time, sign_project, sign_project_id, 
-      new_time, remarks, create_time
-      )
+      new_time, remarks, create_time, 
+      tech_satisfaction, business_satisfaction)
     values (#{id,jdbcType=INTEGER}, #{uid,jdbcType=VARCHAR}, #{aid,jdbcType=VARCHAR}, 
       #{addWechat,jdbcType=INTEGER}, #{wechat,jdbcType=VARCHAR}, #{renewal,jdbcType=INTEGER}, 
       #{renewalTime,jdbcType=TIMESTAMP}, #{signProject,jdbcType=VARCHAR}, #{signProjectId,jdbcType=VARCHAR}, 
-      #{newTime,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}
-      )
+      #{newTime,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{techSatisfaction,jdbcType=INTEGER}, #{businessSatisfaction,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.UserService">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue May 18 15:33:59 CST 2021.
+      This element was generated on Fri May 28 13:36:56 CST 2021.
     -->
     insert into user_service
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -110,6 +112,12 @@
       <if test="createTime != null">
         create_time,
       </if>
+      <if test="techSatisfaction != null">
+        tech_satisfaction,
+      </if>
+      <if test="businessSatisfaction != null">
+        business_satisfaction,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -148,13 +156,19 @@
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="techSatisfaction != null">
+        #{techSatisfaction,jdbcType=INTEGER},
+      </if>
+      <if test="businessSatisfaction != null">
+        #{businessSatisfaction,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.UserService">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue May 18 15:33:59 CST 2021.
+      This element was generated on Fri May 28 13:36:56 CST 2021.
     -->
     update user_service
     <set>
@@ -191,6 +205,12 @@
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="techSatisfaction != null">
+        tech_satisfaction = #{techSatisfaction,jdbcType=INTEGER},
+      </if>
+      <if test="businessSatisfaction != null">
+        business_satisfaction = #{businessSatisfaction,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -198,7 +218,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue May 18 15:33:59 CST 2021.
+      This element was generated on Fri May 28 13:36:56 CST 2021.
     -->
     update user_service
     set `uid` = #{uid,jdbcType=VARCHAR},
@@ -211,7 +231,9 @@
       sign_project_id = #{signProjectId,jdbcType=VARCHAR},
       new_time = #{newTime,jdbcType=TIMESTAMP},
       remarks = #{remarks,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP}
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      tech_satisfaction = #{techSatisfaction,jdbcType=INTEGER},
+      business_satisfaction = #{businessSatisfaction,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="selectByUid" resultType="java.lang.Integer">
@@ -220,23 +242,25 @@
   
   
    <resultMap id="userService" type="com.goafanti.user.bo.OutOrderUserService">
-      <result property="orderNo" column="orderNo"/>
-      <result property="contractNo" column="contractNo"/>
-      <result property="depName" column="depName"/>
-      <result property="userName" column="userName"/>
-      <result property="uid" column="uid"/>
-      <result property="signTimes" column="signTimes"/>
-      <result property="orderTimes" column="orderTimes"/>
-      <result property="newTimes" column="newTimes"/>
-      <result property="adminName" column="adminName"/>
-      <result property="addWechat" column="addWechat"/>
-      <result property="wechat" column="wechat"/>
-      <result property="deleteSign" column="deleteSign"/>
-      <result property="renewal" column="renewal"/>
-      <result property="signProject" column="signProject"/>
-      <result property="remarks" column="remarks"/>
-      <result property="renewalTimes" column="renewalTimes"/>
-      <association property="list" column="orderNo" javaType="java.util.ArrayList" select="getTask"/>
+      <result column="orderNo" property="orderNo" />
+      <result column="contractNo" property="contractNo" />
+      <result column="depName" property="depName" />
+      <result column="userName" property="userName" />
+      <result column="uid" property="uid" />
+      <result column="signTimes" property="signTimes" />
+      <result column="orderTimes" property="orderTimes" />
+      <result column="newTimes" property="newTimes" />
+      <result column="adminName" property="adminName" />
+      <result column="addWechat" property="addWechat" />
+      <result column="wechat" property="wechat" />
+      <result column="deleteSign" property="deleteSign" />
+      <result column="renewal" property="renewal" />
+      <result column="signProject" property="signProject" />
+      <result column="remarks" property="remarks" />
+      <result column="renewalTimes" property="renewalTimes" />
+      <result column="techSatisfaction" property="techSatisfaction" />
+      <result column="businessSatisfaction" property="businessSatisfaction" />
+      <association column="orderNo" javaType="java.util.ArrayList" property="list" select="getTask" />
     </resultMap>
     <select id="getTask" resultType="com.goafanti.user.bo.OrderProject">
     	select id,commodity_name commodityName ,declaration_batch declarationBatch ,
@@ -249,7 +273,8 @@
 select a.order_no orderNo,a.contract_no contractNo,b.dep_name depName ,a.buyer_id uid,a.create_time ,b.buyer_name userName,c.new_time ,
 date_format(a.create_time,'%Y-%m-%d %H:%i:%S') as orderTimes, date_format(c.new_time,'%Y-%m-%d %H:%i:%S') as newTimes,
 date_format(c.renewal_time,'%Y-%m-%d') as renewalTimes, date_format(a.sign_time,'%Y-%m-%d') as signTimes,a.delete_sign deleteSign ,
-d.name adminName,c.add_wechat addWechat,c.wechat ,c.renewal ,c.renewal_time ,c.sign_project signProject ,c.remarks 
+d.name adminName,c.add_wechat addWechat,c.wechat ,c.renewal ,c.renewal_time ,c.sign_project signProject ,c.remarks,
+c.tech_satisfaction techSatisfaction, c.business_satisfaction businessSatisfaction
 from t_order_new a
 left join t_order_mid b on a.order_no =b.order_no  left join user_service c on a.buyer_id =c.uid 
 left join admin d on c.aid =d.id  

+ 86 - 38
src/main/java/com/goafanti/common/model/UserService.java

@@ -7,74 +7,84 @@ public class UserService implements Serializable {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service.id
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	private Integer id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service.uid
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	private String uid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service.aid
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	private String aid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service.add_wechat
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	private Integer addWechat;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service.wechat
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	private String wechat;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service.renewal
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	private Integer renewal;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service.renewal_time
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	private Date renewalTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service.sign_project
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	private String signProject;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service.sign_project_id
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	private String signProjectId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service.new_time
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	private Date newTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service.remarks
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	private String remarks;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service.create_time
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	private Date createTime;
 	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service.tech_satisfaction
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
+	 */
+	private Integer techSatisfaction;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service.business_satisfaction
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
+	 */
+	private Integer businessSatisfaction;
+	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table user_service
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	private static final long serialVersionUID = 1L;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_service.id
 	 * @return  the value of user_service.id
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	public Integer getId() {
 		return id;
@@ -83,7 +93,7 @@ public class UserService implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_service.id
 	 * @param id  the value for user_service.id
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -92,7 +102,7 @@ public class UserService implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_service.uid
 	 * @return  the value of user_service.uid
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	public String getUid() {
 		return uid;
@@ -101,7 +111,7 @@ public class UserService implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_service.uid
 	 * @param uid  the value for user_service.uid
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	public void setUid(String uid) {
 		this.uid = uid == null ? null : uid.trim();
@@ -110,7 +120,7 @@ public class UserService implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_service.aid
 	 * @return  the value of user_service.aid
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	public String getAid() {
 		return aid;
@@ -119,7 +129,7 @@ public class UserService implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_service.aid
 	 * @param aid  the value for user_service.aid
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	public void setAid(String aid) {
 		this.aid = aid == null ? null : aid.trim();
@@ -128,7 +138,7 @@ public class UserService implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_service.add_wechat
 	 * @return  the value of user_service.add_wechat
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	public Integer getAddWechat() {
 		return addWechat;
@@ -137,7 +147,7 @@ public class UserService implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_service.add_wechat
 	 * @param addWechat  the value for user_service.add_wechat
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	public void setAddWechat(Integer addWechat) {
 		this.addWechat = addWechat;
@@ -146,7 +156,7 @@ public class UserService implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_service.wechat
 	 * @return  the value of user_service.wechat
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	public String getWechat() {
 		return wechat;
@@ -155,7 +165,7 @@ public class UserService implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_service.wechat
 	 * @param wechat  the value for user_service.wechat
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	public void setWechat(String wechat) {
 		this.wechat = wechat == null ? null : wechat.trim();
@@ -164,7 +174,7 @@ public class UserService implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_service.renewal
 	 * @return  the value of user_service.renewal
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	public Integer getRenewal() {
 		return renewal;
@@ -173,7 +183,7 @@ public class UserService implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_service.renewal
 	 * @param renewal  the value for user_service.renewal
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	public void setRenewal(Integer renewal) {
 		this.renewal = renewal;
@@ -182,7 +192,7 @@ public class UserService implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_service.renewal_time
 	 * @return  the value of user_service.renewal_time
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	public Date getRenewalTime() {
 		return renewalTime;
@@ -191,7 +201,7 @@ public class UserService implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_service.renewal_time
 	 * @param renewalTime  the value for user_service.renewal_time
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	public void setRenewalTime(Date renewalTime) {
 		this.renewalTime = renewalTime;
@@ -200,7 +210,7 @@ public class UserService implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_service.sign_project
 	 * @return  the value of user_service.sign_project
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	public String getSignProject() {
 		return signProject;
@@ -209,7 +219,7 @@ public class UserService implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_service.sign_project
 	 * @param signProject  the value for user_service.sign_project
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	public void setSignProject(String signProject) {
 		this.signProject = signProject == null ? null : signProject.trim();
@@ -218,7 +228,7 @@ public class UserService implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_service.sign_project_id
 	 * @return  the value of user_service.sign_project_id
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	public String getSignProjectId() {
 		return signProjectId;
@@ -227,7 +237,7 @@ public class UserService implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_service.sign_project_id
 	 * @param signProjectId  the value for user_service.sign_project_id
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	public void setSignProjectId(String signProjectId) {
 		this.signProjectId = signProjectId == null ? null : signProjectId.trim();
@@ -236,7 +246,7 @@ public class UserService implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_service.new_time
 	 * @return  the value of user_service.new_time
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	public Date getNewTime() {
 		return newTime;
@@ -245,7 +255,7 @@ public class UserService implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_service.new_time
 	 * @param newTime  the value for user_service.new_time
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	public void setNewTime(Date newTime) {
 		this.newTime = newTime;
@@ -254,7 +264,7 @@ public class UserService implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_service.remarks
 	 * @return  the value of user_service.remarks
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	public String getRemarks() {
 		return remarks;
@@ -263,7 +273,7 @@ public class UserService implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_service.remarks
 	 * @param remarks  the value for user_service.remarks
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	public void setRemarks(String remarks) {
 		this.remarks = remarks == null ? null : remarks.trim();
@@ -272,7 +282,7 @@ public class UserService implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_service.create_time
 	 * @return  the value of user_service.create_time
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -281,15 +291,51 @@ public class UserService implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_service.create_time
 	 * @param createTime  the value for user_service.create_time
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
 	}
 
 	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_service.tech_satisfaction
+	 * @return  the value of user_service.tech_satisfaction
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
+	 */
+	public Integer getTechSatisfaction() {
+		return techSatisfaction;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_service.tech_satisfaction
+	 * @param techSatisfaction  the value for user_service.tech_satisfaction
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
+	 */
+	public void setTechSatisfaction(Integer techSatisfaction) {
+		this.techSatisfaction = techSatisfaction;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_service.business_satisfaction
+	 * @return  the value of user_service.business_satisfaction
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
+	 */
+	public Integer getBusinessSatisfaction() {
+		return businessSatisfaction;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_service.business_satisfaction
+	 * @param businessSatisfaction  the value for user_service.business_satisfaction
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
+	 */
+	public void setBusinessSatisfaction(Integer businessSatisfaction) {
+		this.businessSatisfaction = businessSatisfaction;
+	}
+
+	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_service
-	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
 	 */
 	@Override
 	public String toString() {
@@ -309,6 +355,8 @@ public class UserService implements Serializable {
 		sb.append(", newTime=").append(newTime);
 		sb.append(", remarks=").append(remarks);
 		sb.append(", createTime=").append(createTime);
+		sb.append(", techSatisfaction=").append(techSatisfaction);
+		sb.append(", businessSatisfaction=").append(businessSatisfaction);
 		sb.append(", serialVersionUID=").append(serialVersionUID);
 		sb.append("]");
 		return sb.toString();

+ 83 - 35
src/main/java/com/goafanti/common/model/UserServiceFollow.java

@@ -7,69 +7,79 @@ public class UserServiceFollow implements Serializable {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service_follow.id
-	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
 	 */
 	private Integer id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service_follow.uid
-	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
 	 */
 	private String uid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service_follow.aid
-	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
 	 */
 	private String aid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service_follow.add_wechat
-	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
 	 */
 	private Integer addWechat;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service_follow.wechat
-	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
 	 */
 	private String wechat;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service_follow.renewal
-	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
 	 */
 	private Integer renewal;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service_follow.renewal_time
-	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
 	 */
 	private Date renewalTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service_follow.sign_project_id
-	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
 	 */
 	private String signProjectId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service_follow.sign_project
-	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
 	 */
 	private String signProject;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service_follow.remarks
-	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
 	 */
 	private String remarks;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service_follow.create_time
-	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
 	 */
 	private Date createTime;
 	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service_follow.tech_satisfaction
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
+	 */
+	private Integer techSatisfaction;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service_follow.business_satisfaction
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
+	 */
+	private Integer businessSatisfaction;
+	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table user_service_follow
-	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
 	 */
 	private static final long serialVersionUID = 1L;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_service_follow.id
 	 * @return  the value of user_service_follow.id
-	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
 	 */
 	public Integer getId() {
 		return id;
@@ -78,7 +88,7 @@ public class UserServiceFollow implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_service_follow.id
 	 * @param id  the value for user_service_follow.id
-	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -87,7 +97,7 @@ public class UserServiceFollow implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_service_follow.uid
 	 * @return  the value of user_service_follow.uid
-	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
 	 */
 	public String getUid() {
 		return uid;
@@ -96,7 +106,7 @@ public class UserServiceFollow implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_service_follow.uid
 	 * @param uid  the value for user_service_follow.uid
-	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
 	 */
 	public void setUid(String uid) {
 		this.uid = uid == null ? null : uid.trim();
@@ -105,7 +115,7 @@ public class UserServiceFollow implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_service_follow.aid
 	 * @return  the value of user_service_follow.aid
-	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
 	 */
 	public String getAid() {
 		return aid;
@@ -114,7 +124,7 @@ public class UserServiceFollow implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_service_follow.aid
 	 * @param aid  the value for user_service_follow.aid
-	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
 	 */
 	public void setAid(String aid) {
 		this.aid = aid == null ? null : aid.trim();
@@ -123,7 +133,7 @@ public class UserServiceFollow implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_service_follow.add_wechat
 	 * @return  the value of user_service_follow.add_wechat
-	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
 	 */
 	public Integer getAddWechat() {
 		return addWechat;
@@ -132,7 +142,7 @@ public class UserServiceFollow implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_service_follow.add_wechat
 	 * @param addWechat  the value for user_service_follow.add_wechat
-	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
 	 */
 	public void setAddWechat(Integer addWechat) {
 		this.addWechat = addWechat;
@@ -141,7 +151,7 @@ public class UserServiceFollow implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_service_follow.wechat
 	 * @return  the value of user_service_follow.wechat
-	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
 	 */
 	public String getWechat() {
 		return wechat;
@@ -150,7 +160,7 @@ public class UserServiceFollow implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_service_follow.wechat
 	 * @param wechat  the value for user_service_follow.wechat
-	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
 	 */
 	public void setWechat(String wechat) {
 		this.wechat = wechat == null ? null : wechat.trim();
@@ -159,7 +169,7 @@ public class UserServiceFollow implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_service_follow.renewal
 	 * @return  the value of user_service_follow.renewal
-	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
 	 */
 	public Integer getRenewal() {
 		return renewal;
@@ -168,7 +178,7 @@ public class UserServiceFollow implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_service_follow.renewal
 	 * @param renewal  the value for user_service_follow.renewal
-	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
 	 */
 	public void setRenewal(Integer renewal) {
 		this.renewal = renewal;
@@ -177,7 +187,7 @@ public class UserServiceFollow implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_service_follow.renewal_time
 	 * @return  the value of user_service_follow.renewal_time
-	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
 	 */
 	public Date getRenewalTime() {
 		return renewalTime;
@@ -186,7 +196,7 @@ public class UserServiceFollow implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_service_follow.renewal_time
 	 * @param renewalTime  the value for user_service_follow.renewal_time
-	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
 	 */
 	public void setRenewalTime(Date renewalTime) {
 		this.renewalTime = renewalTime;
@@ -195,7 +205,7 @@ public class UserServiceFollow implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_service_follow.sign_project_id
 	 * @return  the value of user_service_follow.sign_project_id
-	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
 	 */
 	public String getSignProjectId() {
 		return signProjectId;
@@ -204,7 +214,7 @@ public class UserServiceFollow implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_service_follow.sign_project_id
 	 * @param signProjectId  the value for user_service_follow.sign_project_id
-	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
 	 */
 	public void setSignProjectId(String signProjectId) {
 		this.signProjectId = signProjectId == null ? null : signProjectId.trim();
@@ -213,7 +223,7 @@ public class UserServiceFollow implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_service_follow.sign_project
 	 * @return  the value of user_service_follow.sign_project
-	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
 	 */
 	public String getSignProject() {
 		return signProject;
@@ -222,7 +232,7 @@ public class UserServiceFollow implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_service_follow.sign_project
 	 * @param signProject  the value for user_service_follow.sign_project
-	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
 	 */
 	public void setSignProject(String signProject) {
 		this.signProject = signProject == null ? null : signProject.trim();
@@ -231,7 +241,7 @@ public class UserServiceFollow implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_service_follow.remarks
 	 * @return  the value of user_service_follow.remarks
-	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
 	 */
 	public String getRemarks() {
 		return remarks;
@@ -240,7 +250,7 @@ public class UserServiceFollow implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_service_follow.remarks
 	 * @param remarks  the value for user_service_follow.remarks
-	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
 	 */
 	public void setRemarks(String remarks) {
 		this.remarks = remarks == null ? null : remarks.trim();
@@ -249,7 +259,7 @@ public class UserServiceFollow implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_service_follow.create_time
 	 * @return  the value of user_service_follow.create_time
-	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -258,15 +268,51 @@ public class UserServiceFollow implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_service_follow.create_time
 	 * @param createTime  the value for user_service_follow.create_time
-	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
 	}
 
 	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_service_follow.tech_satisfaction
+	 * @return  the value of user_service_follow.tech_satisfaction
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
+	 */
+	public Integer getTechSatisfaction() {
+		return techSatisfaction;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_service_follow.tech_satisfaction
+	 * @param techSatisfaction  the value for user_service_follow.tech_satisfaction
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
+	 */
+	public void setTechSatisfaction(Integer techSatisfaction) {
+		this.techSatisfaction = techSatisfaction;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_service_follow.business_satisfaction
+	 * @return  the value of user_service_follow.business_satisfaction
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
+	 */
+	public Integer getBusinessSatisfaction() {
+		return businessSatisfaction;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_service_follow.business_satisfaction
+	 * @param businessSatisfaction  the value for user_service_follow.business_satisfaction
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
+	 */
+	public void setBusinessSatisfaction(Integer businessSatisfaction) {
+		this.businessSatisfaction = businessSatisfaction;
+	}
+
+	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_service_follow
-	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 * @mbg.generated  Fri May 28 13:37:12 CST 2021
 	 */
 	@Override
 	public String toString() {
@@ -285,6 +331,8 @@ public class UserServiceFollow implements Serializable {
 		sb.append(", signProject=").append(signProject);
 		sb.append(", remarks=").append(remarks);
 		sb.append(", createTime=").append(createTime);
+		sb.append(", techSatisfaction=").append(techSatisfaction);
+		sb.append(", businessSatisfaction=").append(businessSatisfaction);
 		sb.append(", serialVersionUID=").append(serialVersionUID);
 		sb.append("]");
 		return sb.toString();

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

@@ -23,7 +23,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.goafanti.common.bo.EmailBo;
 import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.dao.NoticeMapper;
 import com.goafanti.common.dao.PaymentNodeMapper;
 import com.goafanti.common.dao.TArrearsDunMapper;
 import com.goafanti.common.dao.TOrderMidMapper;
@@ -61,8 +60,6 @@ public class OrderDunTask {
 	@Autowired
 	private TOrderMidMapper	tOrderMidMapper;
 	@Autowired
-	private NoticeMapper	noticeMapper;
-	@Autowired
 	private PaymentNodeMapper	paymentNodeMapper;
 	@Autowired
 	private OrderProjectService	orderProjectService;
@@ -256,7 +253,7 @@ public class OrderDunTask {
 					td.setStartTime(date);
 					td.setOrderArrears(tm.getOrderArrears());
 					td.setOrderReceivables(tm.getOrderReceivables());
-					addNoticAndSendEmail(td.getOrderNo(),td,NoticeStatus.ORDER_ARREARS_DUN.getCode());
+					addNotic(td.getOrderNo(),td,NoticeStatus.ORDER_ARREARS_DUN.getCode());
 					tArrearsDunMapper.updateByPrimaryKeySelective(td);
 				}else if(tm.getOrderArrears().compareTo(new BigDecimal(0))<1) {
 					td.setDunStatus(2);
@@ -278,7 +275,7 @@ public class OrderDunTask {
 					ta.setOrderArrears(tm.getOrderArrears());
 					ta.setOrderReceivables(tm.getOrderReceivables());
 					tArrearsDunMapper.insertSelective(ta);
-					addNoticAndSendEmail(ta.getOrderNo(),ta,NoticeStatus.ORDER_ARREARS_DUN.getCode());
+					addNotic(ta.getOrderNo(),ta,NoticeStatus.ORDER_ARREARS_DUN.getCode());
 				}else if(tm.getOrderArrears().compareTo(new BigDecimal(0))<1) {
 					ta.setDunStatus(2);
 					ta.setOrderArrears(tm.getOrderArrears());
@@ -299,7 +296,7 @@ public class OrderDunTask {
 					ta.setOrderArrears(tm.getOrderArrears());
 					ta.setOrderReceivables(tm.getOrderReceivables());
 					tArrearsDunMapper.insertSelective(ta);
-					addNoticAndSendEmail(ta.getOrderNo(),ta,NoticeStatus.ORDER_ARREARS_DUN.getCode());
+					addNotic(ta.getOrderNo(),ta,NoticeStatus.ORDER_ARREARS_DUN.getCode());
 				}else if(tm.getOrderArrears().compareTo(new BigDecimal(0))<1) {
 					ta.setDunStatus(2);
 					ta.setOrderReceivables(tm.getOrderReceivables());
@@ -315,7 +312,7 @@ public class OrderDunTask {
 	}
 	
 	
-	private void addNoticAndSendEmail(String orderNo, TArrearsDun td, Integer code) throws UnsupportedEncodingException, MessagingException {
+	private void addNotic(String orderNo, TArrearsDun td, Integer code) throws UnsupportedEncodingException, MessagingException {
 		TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(orderNo);
 			String str=NoticeStatus.getValueByCode(code)+": 订单编号 -"+orderNo+", 操作人: 平台超管中心 - yxy。";
 			Notice n =new Notice();
@@ -324,7 +321,7 @@ public class OrderDunTask {
 			n.setNoticeType(code);
 			n.setContent(str);
 			n.setReaded(0);//未读
-			noticeMapper.insertSelective(n);
+			asyncUtils.addNotice(n);
 	}
 
 

+ 30 - 22
src/main/java/com/goafanti/common/task/PatentTask.java

@@ -23,7 +23,6 @@ import org.springframework.web.bind.annotation.RestController;
 import com.goafanti.admin.service.AdminService;
 import com.goafanti.common.bo.EmailBo;
 import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.dao.NoticeMapper;
 import com.goafanti.common.dao.UserMapper;
 import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.enums.PatentCategoryStatus;
@@ -40,6 +39,7 @@ import com.goafanti.patent.service.PatentNewService;
 
 
 
+
 @Component
 @RestController
 public class PatentTask {
@@ -48,8 +48,6 @@ public class PatentTask {
 	@Resource
 	private AdminService adminService;
 	@Autowired
-	private NoticeMapper	noticeMapper;
-	@Autowired
 	private UserMapper	userMapper;
 	@Autowired
 	private AsyncUtils	asyncUtils;
@@ -85,6 +83,7 @@ public class PatentTask {
 			List<PatentNewLog> logList = new ArrayList<>();
 			for (PatentNew p : l) {
 				//因为改成数据关联字段修改
+				System.out.println(p.getName());
 				String userName ="";
 				if (p.getUid()!=null) {
 					userName=userMapper.selectByPrimaryKey(p.getUid()).getUsername();
@@ -171,22 +170,21 @@ public class PatentTask {
 						EmailBo emailBo = new EmailBo("专利提醒", p.getEmail().trim(),userName, "科德集团", a.getName(),
 								p.getName(), p.getPatentNo(), money.toString(), DateFormatUtils.format(ted, "yyyy-MM-dd"),status);
 						n.setNoticeType(NoticeStatus.TASK_PATENT_REMIND.getCode());
-						String title = "专利提醒";
+						String title = "专利提醒成功!";
 						p.setStatus(status);// 提醒中
 						try {
 							asyncUtils.patentSend(emailBo);
 						} catch (SendFailedException e) {
 							// 如果邮件发送失败提醒
 							n.setNoticeType(NoticeStatus.TASK_PATENT_ERROR.getCode());
-							title = "专利提醒失败!对方邮箱不存在或者拒收";
+							title = "提醒失败!对方邮箱不存在或者拒收";
 							p.setStatus(0);
 						}
 						p.setPatentAmount(money);
 						p.setYears(y);
 						patentNewService.updatePatenNew(p);
 						PatentNewLog pl = new PatentNewLog();
-						String str = StrToString(title, p.getEmail().trim(), userName, a.getName(), p.getName(),
-								p.getPatentNo(), money.toString(), DateFormatUtils.format(ted, "yyyy-MM-dd"),status);
+						String str = StrToString(title, p.getEmail().trim(), userName ,p.getName(),now,status);
 						pl.setContent(str);
 						pl.setCreateTime(new Date());
 						pl.setPid(p.getId());
@@ -203,8 +201,7 @@ public class PatentTask {
 				for (int i = 0; i < nlist.size(); i++) {
 					newList.add(nlist.get(i));
 					if (pointsDataLimit == newList.size() || i == nlist.size() - 1) {
-						if (newList.size() > 0)
-							noticeMapper.insertBatch(newList);
+						if (newList.size() > 0) asyncUtils.addNoticeBatch(newList);
 						newList.clear();
 						Thread.sleep(2000);
 					}
@@ -226,7 +223,7 @@ public class PatentTask {
 			LoggerUtils.debug(getClass(), "=====================专利提醒失败======================");
 			Notice n = new Notice(UUID.randomUUID().toString(), new Date(), 0, "1",
 					NoticeStatus.TASK_PATENT_ERROR.getCode(), "==============专利提醒失败================");
-			noticeMapper.insert(n);
+			asyncUtils.addNotice(n);
 			e.printStackTrace();
 		}
 
@@ -234,15 +231,28 @@ public class PatentTask {
 	}
 	
 
-	private String StrToString(String name, String email, String applicant,  String adminName, String pantentName,
-		String pantentNo, String money, String format, Integer status) {
-		StringBuilder str =new StringBuilder();
-		str.append(name).append(":").append("邮箱:").append(email).append(",授权公司:").append(applicant).append(",录入人:").append(adminName)
-		.append(",专利名称:").append(pantentName).append (",专利编号:").append(pantentNo).append(",金额:").append(money).append(",时间:").append(format);
-		return str.toString();
-}
-
-
+	private String StrToString(String title, String email, String userName, String pname, Calendar now, Integer status) {
+		//状态 0 未提醒 1 剩余90天 2剩余30天 3剩余20天 4剩余10天 5剩余3天 6剩余2天 7剩余1天
+		Integer days=0;
+		StringBuffer sb=new StringBuffer().append(title).append("客户[").append(userName).append("]专利[")
+				.append(pname).append("]");
+		if (status==1) days=90;
+		else if (status==2) days=30;
+		else if (status==3) days=20;
+		else if (status==4) days=10;
+		else if (status==5) days=3;
+		else if (status==6) days=2;
+		else if (status==7) days=1;
+		if(days>0) {
+			sb.append(",续费时间还剩").append(days).append("天");
+		}
+		sb.append(",已于").append(DateUtils.formatDate(now.getTime(), AFTConstants.YYYYMMDDHHMMSS)).append("发送专利提醒至邮箱")
+			.append(email).append("!");
+				
+		
+		return sb.toString();
+	}
+	
 	/**
 	 * 
 	 * @param 年份
@@ -318,9 +328,7 @@ public class PatentTask {
         public static void main(String[] args) {
         	// 申请时间一月份是0。
 			Calendar sq = Calendar.getInstance();
-			sq.set(2020, 4, 27);
-			sq.add(Calendar.DATE, 1);
-			sq.add(Calendar.DATE, 90);
+			sq.set(2020, 4, 30);
 			System.out.println(DateUtils.formatDate(sq.getTime(), AFTConstants.YYYYMMDD));
 			// 当前时间
 			Calendar now = Calendar.getInstance();

+ 4 - 4
src/main/java/com/goafanti/common/task/ReleaseUserTask.java

@@ -108,7 +108,7 @@ public class ReleaseUserTask {
 				newList.add(ln.get(i));
 				if (pointsDataLimit == newList.size() || i == ln.size() - 1) {
 					if (newList.size() > 0)
-						noticeMapper.insertBatch(newList);
+						asyncUtils.addNoticeBatch(newList);
 					newList.clear();
 					Thread.sleep(2000);
 				}
@@ -197,7 +197,7 @@ public class ReleaseUserTask {
 		} catch (Exception e) {
 			Notice n = new Notice(UUID.randomUUID().toString(), new Date(), 0, "1",
 					NoticeStatus.TASK_PATENT_ERROR.getCode(), "==============客户释放失败================",null);
-			noticeMapper.insert(n);
+			asyncUtils.addNotice(n);
 			EmailBo emailBo = new EmailBo("释放客户失败", AFTConstants.ADMIN_EMAIL, "超管", "平台", "系统", "释放客户失败");
 			try {
 				asyncUtils.send(emailBo);
@@ -224,7 +224,7 @@ public class ReleaseUserTask {
 					String.format("您的%s客户【%s】已经270天未签单,已经自动释放!", "私有", u.getUserName()),
 					u.getUid()));
 		}
-		if(!nl.isEmpty())noticeMapper.insertBatch(nl);
+		if(!nl.isEmpty())asyncUtils.addNoticeBatch(nl);
 	}
 
 	private void addChannelNotice(List<userDaysBo> hsList, List<userDaysBo> sfList) {
@@ -242,7 +242,7 @@ public class ReleaseUserTask {
 					String.format("您的%s客户【%s】已经90天未跟进,已经自动释放!", "渠道", sf.getName()),
 					sf.getUid()));
 		}
-		if(!nl.isEmpty())noticeMapper.insertBatch(nl);
+		if(!nl.isEmpty())asyncUtils.addNoticeBatch(nl);
 	}
 
 }

+ 24 - 2
src/main/java/com/goafanti/common/utils/AsyncUtils.java

@@ -1,24 +1,46 @@
 package com.goafanti.common.utils;
 
 import java.io.UnsupportedEncodingException;
+import java.util.List;
 
 import javax.mail.MessagingException;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
 import com.goafanti.common.bo.EmailBo;
+import com.goafanti.common.dao.NoticeMapper;
+import com.goafanti.common.enums.NoticeTypes;
+import com.goafanti.common.model.Notice;
 
 @Component
+@Async
 public class AsyncUtils {
+	@Autowired
+	private NoticeMapper noticeMapper;
 
-	@Async
+	
 	public void patentSend(EmailBo bo) throws UnsupportedEncodingException, MessagingException {
 		SendEmailUtil.getInstance().patentSend(bo);
 	}
 	
-	@Async
+	
 	public void send(EmailBo bo) throws UnsupportedEncodingException, MessagingException {
 		SendEmailUtil.getInstance().send(bo);
 	}
+	
+	public void addNotice(Notice n ) {
+		n.setType(NoticeTypes.getType(n.getNoticeType()));
+		noticeMapper.insertSelective(n);
+	}
+	
+	
+	public void addNoticeBatch(List<Notice> list){
+		for (Notice n : list) {
+			n.setType(NoticeTypes.getType(n.getNoticeType()));
+		}
+		noticeMapper.insertBatch(list);
+		
+	}
 }

+ 4 - 3
src/main/java/com/goafanti/contract/service/impl/ContractServiceImpl.java

@@ -29,6 +29,7 @@ import com.goafanti.common.model.Contract;
 import com.goafanti.common.model.ContractLog;
 import com.goafanti.common.model.Notice;
 import com.goafanti.common.model.User;
+import com.goafanti.common.utils.AsyncUtils;
 import com.goafanti.common.utils.DateUtils;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.contract.bo.ContractClientListBo;
@@ -49,7 +50,7 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
 	@Autowired
 	private UserMapper			userMapper;
 	@Autowired
-	private NoticeMapper		noticeMapper;
+	private AsyncUtils		asyncUtils;
 	@Autowired
 	private PatentInfoMapper	patentInfoMapper;
 	@Autowired
@@ -176,7 +177,7 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
 			notice.add(createNotice(c, log));
 		}
 		contractLogMapper.insertBatch(logs);
-		noticeMapper.insertBatch(notice);
+		asyncUtils.addNoticeBatch(notice);
 
 	}
 
@@ -235,7 +236,7 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
 			notice.add(createNotice(c, log));
 		}
 		contractLogMapper.insertBatch(logs);
-		noticeMapper.insertBatch(notice);
+		asyncUtils.addNoticeBatch(notice);
 	}
 
 	@Override

+ 0 - 1
src/main/java/com/goafanti/copyright/service/impl/CopyrightInfoServiceImpl.java

@@ -345,7 +345,6 @@ public class CopyrightInfoServiceImpl extends BaseMybatisDao<CopyrightInfoMapper
 		n.setAid(l.getPrincipal());
 		n.setContent("编号" + info.getSerialNumber() + "  " + CopyrightStatus.getStatus(l.getStatus()).getDesc());
 		n.setNoticeType(NoticeStatus.COPYRIGHT.getCode());
-		// noticeMapper.insert(n);
 	}
 
 }

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

@@ -31,7 +31,6 @@ import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.dao.BusinessGlossoryMapper;
 import com.goafanti.common.dao.BusinessProjectMapper;
-import com.goafanti.common.dao.NoticeMapper;
 import com.goafanti.common.dao.OrganizationAnnualReportMapper;
 import com.goafanti.common.dao.OrganizationApplicationInfoMapper;
 import com.goafanti.common.dao.OrganizationBusinessScopeMapper;
@@ -125,8 +124,6 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	@Resource
 	private AdminMapper adminMapper;
 	@Resource
-	private NoticeMapper noticeMapper;
-	@Resource
 	private OrganizationApplicationInfoMapper organizationApplicationInfoMapper;
 	@Resource
 	private OrganizationAnnualReportMapper organizationAnnualReportMapper;

+ 7 - 8
src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java

@@ -32,7 +32,6 @@ import com.goafanti.common.dao.DemandMapper;
 import com.goafanti.common.dao.FieldGlossoryMapper;
 import com.goafanti.common.dao.NewsInterestMapper;
 
-import com.goafanti.common.dao.NoticeMapper;
 import com.goafanti.common.dao.OrganizationIdentityMapper;
 import com.goafanti.common.dao.ProjectInterestMapper;
 import com.goafanti.common.dao.UserIdentityMapper;
@@ -58,6 +57,7 @@ import com.goafanti.common.model.Notice;
 import com.goafanti.common.model.OrganizationIdentity;
 import com.goafanti.common.model.User;
 import com.goafanti.common.model.UserIdentity;
+import com.goafanti.common.utils.AsyncUtils;
 import com.goafanti.common.utils.DateUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
@@ -88,8 +88,6 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 	@Autowired
 	private UserRoleMapper					userRoleMapper;
 	@Autowired
-	private NoticeMapper					noticeMapper;
-	@Autowired
 	private DemandKeywordMapper				demandKeywordMapper;
 	@Autowired
 	private AchievementDemandMapper			achievementDemandMapper;
@@ -114,6 +112,8 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 	private UserInterestMapper	userInterestMapper;
 	@Autowired
 	ProjectInterestMapper	projectInterestMapper; 
+	@Autowired
+	AsyncUtils	asyncUtils;
 	
 	
 	DemandFollowDetailMapper	demandFollowDetailMapper;
@@ -679,13 +679,12 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 			for (String s : ids) {
 				list.add(disposeNotice(d, s));
 			}
-			noticeMapper.insertBatch(list);
+			asyncUtils.addNoticeBatch(list);
 		}
 	}
 
 	// 给指派技术经纪人发送审核结果通知
 	private void createTechBorkerNotice(Demand a) {
-		// noticeMapper.insert(disposeNotice(a, null));
 	}
 
 	private Notice disposeNotice(Demand d, String aid) {
@@ -970,7 +969,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		return (Pagination<DemandSearchListBo>) findPage("findAppMyDemandListByPage", "findAppMyDemandCount", params, pNo, pSize);
 	}
 
-
+
 	public int saveAppUserDemand(Demand d, String validityPeriodFormattedDate, String[] keywords) {
 		Date validityPeriod = null;
 		if (!StringUtils.isBlank(validityPeriodFormattedDate)) {
@@ -1016,7 +1015,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		return demandMapper.insert(d);
 	}
 
-
+
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<DemandManageListBo> selectMyDemandManageList(Integer dataCategory,String employerName, Integer auditStatus,
@@ -1057,7 +1056,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		return (Pagination<DemandManageListBo>) findPage("findMyDemandListByPage", "findMyDemandCount",
 				params, pNo, pSize);
 	}
-	
+	
 	
 	@SuppressWarnings("unchecked")
 	@Override

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

@@ -41,7 +41,6 @@ import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.dao.IdleContractNoMapper;
 import com.goafanti.common.dao.NewOrderDunMapper;
-import com.goafanti.common.dao.NoticeMapper;
 import com.goafanti.common.dao.OrganizationContactBookMapper;
 import com.goafanti.common.dao.OrganizationManagementMapper;
 import com.goafanti.common.dao.OutsourceLogMapper;
@@ -154,8 +153,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	@Autowired
 	private TOrderLogMapper tOrderLogMapper;
 	@Autowired
-	private NoticeMapper	noticeMapper;
-	@Autowired
 	private OrderService	orderService;
 	@Autowired
 	private IdleContractNoMapper	idleContractNoMapper;
@@ -1167,7 +1164,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		n.setNoticeType(type);
 		n.setContent(str);
 		n.setReaded(0);//未读
-		noticeMapper.insertSelective(n);
+		asyncUtils.addNotice(n);
 	}
 	public void  sendEmail(String orderNo,String dunId,AdminListBo a,TOrderNewBo b) throws UnsupportedEncodingException, MessagingException{
 		LoggerUtils.debug(logger, "======================邮件信息发送===================");
@@ -1230,7 +1227,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			Admin admin = adminMapper.selectAllByid(string);
 			if(admin!=null&&SendEmailUtil.isEmail(admin.getEmail().trim()))adminIds+=admin.getEmail()+",";
 		}
-		if(!nlist.isEmpty())noticeMapper.insertBatch(nlist);
+		if(!nlist.isEmpty())asyncUtils.addNoticeBatch(nlist);
 		if (!nlist.isEmpty()&&StringUtils.isNotBlank(adminIds)) {
 			adminIds=adminIds.substring(0, adminIds.length()-1);
 			EmailBo bo = new EmailBo(NoticeStatus.getValueByCode(type), adminIds, a.getDepartmentName(), a.getName(), "请登录查看"

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

@@ -30,7 +30,6 @@ import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.dao.BusinessProjectMapper;
 import com.goafanti.common.dao.NewOrderDunMapper;
-import com.goafanti.common.dao.NoticeMapper;
 import com.goafanti.common.dao.OrganizationContactBookMapper;
 import com.goafanti.common.dao.OrganizationIdentityMapper;
 import com.goafanti.common.dao.PaymentNodeMapper;
@@ -148,8 +147,6 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	@Autowired
 	private PaymentNodeMapper	paymentNodeMapper;
 	@Autowired
-	private NoticeMapper	noticeMapper;
-	@Autowired
 	private TTaskMidMapper	tTaskMidMapper;
 	@Autowired
 	private UserMapper	userMapper;
@@ -660,7 +657,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		n.setNoticeType(type);
 		n.setContent(str);
 		n.setReaded(0);//未读
-		noticeMapper.insertSelective(n);
+		asyncUtils.addNotice(n);
 		pn.setDunStatus(1);
 		paymentNodeMapper.updateByPrimaryKeySelective(pn);
 		//营销员名称、邮箱、订单编号、客户名称

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

@@ -28,7 +28,6 @@ import com.goafanti.common.dao.BusinessProjectMapper;
 import com.goafanti.common.dao.ContractMapper;
 import com.goafanti.common.dao.ContractTaskLogMapper;
 import com.goafanti.common.dao.ContractTaskMapper;
-import com.goafanti.common.dao.NoticeMapper;
 import com.goafanti.common.dao.OrganizationManagementMapper;
 import com.goafanti.common.dao.TOrderBillMapper;
 import com.goafanti.common.dao.TOrderChangeMapper;
@@ -64,6 +63,7 @@ import com.goafanti.common.model.UserFollow;
 import com.goafanti.common.model.UserFollowBusiness;
 import com.goafanti.common.model.UserLockRelease;
 import com.goafanti.common.model.UserRole;
+import com.goafanti.common.utils.AsyncUtils;
 import com.goafanti.common.utils.BeanUtilsExt;
 import com.goafanti.common.utils.DateUtils;
 import com.goafanti.common.utils.MobileMessageUtils;
@@ -127,7 +127,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 	@Autowired
 	private AdminMapper adminMapper;
 	@Autowired
-	private NoticeMapper noticeMapper;
+	private AsyncUtils	asyncUtils;
 	@Autowired
 	private ContractTaskLogMapper contractTaskLogMapper;
 	@Autowired
@@ -1994,7 +1994,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 				noticeList.add(notice);
 			}
 			MobileNotice( targetIds, tOrder);
-			noticeMapper.insertBatch(noticeList);
+			asyncUtils.addNoticeBatch(noticeList);
 			//触发短信提醒
 			List<UserRole> list=userRoleMapper. selectAdminRole(AFTConstants.CONSULTANT_MANAGER);
 				for (UserRole u : list) {

+ 2 - 6
src/main/java/com/goafanti/organization/service/impl/ThirdPartyCompanyServiceImpl.java

@@ -21,7 +21,6 @@ import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.dao.CompanyLibraryMapper;
 import com.goafanti.common.dao.FinancialPaymentMapper;
-import com.goafanti.common.dao.NoticeMapper;
 import com.goafanti.common.dao.OfficialFeePriceMapper;
 import com.goafanti.common.dao.PatentPriceMapper;
 import com.goafanti.common.dao.PaymentLogMapper;
@@ -82,8 +81,6 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 	@Autowired
 	private AdminMapper	adminMapper;
 	@Autowired
-	private NoticeMapper	noticeMapper;
-	@Autowired
 	private FinancialPaymentMapper	financialPaymentMapper;
 	@Autowired
 	private TOrderTaskMapper	tOrderTaskMapper;
@@ -467,7 +464,7 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 		n.setNoticeType(type);
 		n.setContent(str);
 		n.setReaded(0);//未读
-		noticeMapper.insertSelective(n);
+		asyncUtils.addNotice(n);
 		if(StringUtils.isNotBlank(a.getEmail())) {
 			try {
 				asyncUtils.send(bo);
@@ -744,8 +741,7 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 				elist.add(Integer.valueOf(s));
 			}
 		}
-		if(!nlist.isEmpty())noticeMapper.insertBatch(nlist);
-//		if(!list.isEmpty())tOrderPaymentMapper.updateByids(list);
+		if(!nlist.isEmpty())asyncUtils.addNoticeBatch(nlist);
 		Map<String ,Object> map=new HashMap<>();
 		map.put("OK", list);
 		map.put("fail", elist);

+ 0 - 1
src/main/java/com/goafanti/patent/service/impl/PatentInfoServiceImpl.java

@@ -633,7 +633,6 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 		n.setAid(l.getPrincipal());
 		n.setContent("编号" + info.getSerialNumber() + "  " + PatentInfoStatus.getStatus(l.getState()).getDesc());
 		n.setNoticeType(NoticeStatus.PATENTINFO.getCode());
-		// noticeMapper.insert(n);
 	}
 
 }

+ 0 - 1
src/main/java/com/goafanti/techproject/service/impl/TechProjectServiceImpl.java

@@ -326,7 +326,6 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 		n.setAid(l.getPrincipal());
 		n.setContent("编号" + info.getSerialNumber() + "  " + TechProjectStatus.getStatus(l.getState()).getDesc());
 		n.setNoticeType(NoticeStatus.TECHPROJECT.getCode());
-		// noticeMapper.insert(n);
 	}
 
 	@SuppressWarnings("unchecked")

+ 16 - 0
src/main/java/com/goafanti/user/bo/OutOrderUserService.java

@@ -45,11 +45,27 @@ public class OutOrderUserService {
 	private String signProject;
 	@Excel(name = "备注")
 	private String remarks;
+	@Excel(name = "技术端满意度",readConverterExp = "0=已投诉,1=不满意,2=一般满意,3=非常满意")
+	private Integer techSatisfaction;
+	@Excel(name = "业务端满意度",readConverterExp = "0=已投诉,1=不满意,2=一般满意,3=非常满意")
+	private Integer businessSatisfaction;
 	private String uid;
 	private List<OrderProject> list;
 	
 	
 	
+	public Integer getTechSatisfaction() {
+		return techSatisfaction;
+	}
+	public void setTechSatisfaction(Integer techSatisfaction) {
+		this.techSatisfaction = techSatisfaction;
+	}
+	public Integer getBusinessSatisfaction() {
+		return businessSatisfaction;
+	}
+	public void setBusinessSatisfaction(Integer businessSatisfaction) {
+		this.businessSatisfaction = businessSatisfaction;
+	}
 	public Integer getDeleteSign() {
 		return deleteSign;
 	}

+ 3 - 4
src/main/java/com/goafanti/user/service/impl/OrganizationIdentityServiceImpl.java

@@ -17,7 +17,6 @@ import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.stereotype.Service;
 
 import com.goafanti.common.bo.Result;
-import com.goafanti.common.dao.NoticeMapper;
 import com.goafanti.common.dao.OrgHumanResourceMapper;
 import com.goafanti.common.dao.OrgRatepayMapper;
 import com.goafanti.common.dao.OrganizationIdentityMapper;
@@ -34,6 +33,7 @@ import com.goafanti.common.model.OrgHumanResource;
 import com.goafanti.common.model.OrgRatepay;
 import com.goafanti.common.model.OrganizationIdentity;
 import com.goafanti.common.model.User;
+import com.goafanti.common.utils.AsyncUtils;
 import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
@@ -60,7 +60,7 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 	@Autowired
 	private OrgHumanResourceMapper		orgHumanResourceMapper;
 	@Autowired
-	private NoticeMapper				noticeMapper;
+	private AsyncUtils				asyncUtils;
 	@Autowired
 	private UserRoleMapper				userRoleMapper;
 
@@ -304,7 +304,7 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 				n.setNoticeType(NoticeStatus.ORGANIZATIONCERTIFY.getCode());
 				list.add(n);
 			}
-			noticeMapper.insertBatch(list);
+			asyncUtils.addNoticeBatch(list);
 		}
 	}
 
@@ -330,7 +330,6 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 		}
 		n.setContent(content);
 		n.setNoticeType(NoticeStatus.ORGANIZATIONCERTIFY.getCode());
-		// noticeMapper.insert(n);
 	}
 
 	@Override

+ 3 - 3
src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java

@@ -22,7 +22,6 @@ import com.goafanti.common.bo.fieldGlossoryBo;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.DistrictGlossoryMapper;
 import com.goafanti.common.dao.IndustryCategoryMapper;
-import com.goafanti.common.dao.NoticeMapper;
 import com.goafanti.common.dao.UserIdentityMapper;
 import com.goafanti.common.dao.UserInterestMapper;
 import com.goafanti.common.dao.UserMapper;
@@ -35,6 +34,7 @@ import com.goafanti.common.enums.UserLevel;
 import com.goafanti.common.model.Notice;
 import com.goafanti.common.model.User;
 import com.goafanti.common.model.UserIdentity;
+import com.goafanti.common.utils.AsyncUtils;
 import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
@@ -55,7 +55,7 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 	@Autowired
 	private UserRoleMapper		userRoleMapper;
 	@Autowired
-	private NoticeMapper		noticeMapper;
+	private AsyncUtils		asyncUtils;
 	@Autowired
 	DistrictGlossoryMapper districtGlossoryMapper;
 	@Autowired
@@ -254,7 +254,7 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 				n.setNoticeType(NoticeStatus.PERSONALCERTIFY.getCode());
 				list.add(n);
 			}
-			noticeMapper.insertBatch(list);
+			asyncUtils.addNoticeBatch(list);
 		}
 	}