Browse Source

新增会员日志列表

anderx 3 years ago
parent
commit
d8008d47fa

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

@@ -1,6 +1,9 @@
 package com.goafanti.common.dao;
 
 import com.goafanti.common.model.MemberLog;
+import com.goafanti.order.bo.MemberLogBo;
+
+import java.util.List;
 
 public interface MemberLogMapper {
     int deleteByPrimaryKey(Integer id);
@@ -14,4 +17,6 @@ public interface MemberLogMapper {
     int updateByPrimaryKeySelective(MemberLog record);
 
     int updateByPrimaryKey(MemberLog record);
-}
+
+    List<MemberLogBo> memberLog(Integer id);
+}

+ 0 - 6
src/main/java/com/goafanti/common/enums/OrderLogProcess.java

@@ -28,12 +28,6 @@ public enum OrderLogProcess {
 	XMWBTG(15,"项目外包通过"),
 	XMWBBH(16,"项目外包驳回"),
 	DDLZZJ(17,"订单离职转交"),
-	HYXMFQ(18,"会员项目发起"),
-	HYCWTG(19,"会员财务通过"),
-	HYTPTG(20,"会员特批通过"),
-	HYCWBH(21,"会员财务驳回"),
-	HYTPBH(22,"会员特批驳回"),
-	HYXMWC(23,"会员项目完成"),
 	NOT(99,"未知"),
 	;
 

+ 37 - 10
src/main/java/com/goafanti/common/mapper/MemberLogMapper.xml

@@ -4,35 +4,45 @@
   <resultMap id="BaseResultMap" type="com.goafanti.common.model.MemberLog">
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="pid" jdbcType="INTEGER" property="pid" />
+    <result column="aid" jdbcType="VARCHAR" property="aid" />
     <result column="status" jdbcType="INTEGER" property="status" />
     <result column="remarks" jdbcType="VARCHAR" property="remarks" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
   </resultMap>
   <sql id="Base_Column_List">
-    id, pid, `status`, remarks, create_time
+    id, pid, aid, `status`, remarks, create_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    select 
+    select
     <include refid="Base_Column_List" />
     from member_log
     where id = #{id,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
     delete from member_log
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.MemberLog" useGeneratedKeys="true">
-    insert into member_log (pid, `status`, remarks, 
-      create_time)
-    values (#{pid,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{remarks,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP})
+  <insert id="insert" parameterType="com.goafanti.common.model.MemberLog">
+    insert into member_log (id, pid, aid,
+      `status`, remarks, create_time
+      )
+    values (#{id,jdbcType=INTEGER}, #{pid,jdbcType=INTEGER}, #{aid,jdbcType=VARCHAR},
+      #{status,jdbcType=INTEGER}, #{remarks,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}
+      )
   </insert>
-  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.MemberLog" useGeneratedKeys="true">
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.MemberLog">
     insert into member_log
     <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
       <if test="pid != null">
         pid,
       </if>
+      <if test="aid != null">
+        aid,
+      </if>
       <if test="status != null">
         `status`,
       </if>
@@ -44,9 +54,15 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
       <if test="pid != null">
         #{pid,jdbcType=INTEGER},
       </if>
+      <if test="aid != null">
+        #{aid,jdbcType=VARCHAR},
+      </if>
       <if test="status != null">
         #{status,jdbcType=INTEGER},
       </if>
@@ -64,6 +80,9 @@
       <if test="pid != null">
         pid = #{pid,jdbcType=INTEGER},
       </if>
+      <if test="aid != null">
+        aid = #{aid,jdbcType=VARCHAR},
+      </if>
       <if test="status != null">
         `status` = #{status,jdbcType=INTEGER},
       </if>
@@ -79,9 +98,17 @@
   <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.MemberLog">
     update member_log
     set pid = #{pid,jdbcType=INTEGER},
+      aid = #{aid,jdbcType=VARCHAR},
       `status` = #{status,jdbcType=INTEGER},
       remarks = #{remarks,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
-</mapper>
+
+  <select id="memberLog" resultType="com.goafanti.order.bo.MemberLogBo">
+    select a.id, a.pid, a.aid, a.`status`, a.remarks, a.create_time createTime,
+           b.name aname,date_format(a.create_time,'%Y-%m-%d %H:%i:%s' )createTimes
+    from member_log a left join admin b on a.aid =b.id
+    where pid= #{id}
+  </select>
+</mapper>

+ 14 - 1
src/main/java/com/goafanti/common/model/MemberLog.java

@@ -19,12 +19,17 @@ public class MemberLog implements Serializable {
     private Integer pid;
 
     /**
+     * 开票id
+     */
+    private String aid;
+
+    /**
      * 审核状态 0=发起,1=通过,2=拒绝,3=完成
      */
     private Integer status;
 
     /**
-     * 操作人
+     * 备注
      */
     private String remarks;
 
@@ -51,6 +56,14 @@ public class MemberLog implements Serializable {
         this.pid = pid;
     }
 
+    public String getAid() {
+        return aid;
+    }
+
+    public void setAid(String aid) {
+        this.aid = aid;
+    }
+
     public Integer getStatus() {
         return status;
     }

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

@@ -0,0 +1,25 @@
+package com.goafanti.order.bo;
+
+import com.goafanti.common.model.MemberLog;
+
+public class MemberLogBo  extends MemberLog {
+
+    private String aname;
+    private String createTimes;
+
+    public String getAname() {
+        return aname;
+    }
+
+    public void setAname(String aname) {
+        this.aname = aname;
+    }
+
+    public String getCreateTimes() {
+        return createTimes;
+    }
+
+    public void setCreateTimes(String createTimes) {
+        this.createTimes = createTimes;
+    }
+}

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

@@ -548,6 +548,17 @@ public class OrderProjectApiController extends CertifyApiController {
 
 	/**
 	 * 会员项目列表
+	 * @return
+	 */
+	@RequestMapping(value = "/memberLog" ,method = RequestMethod.GET)
+	public Result memberLog(Integer id){
+		Result res = new Result();
+		return res.data(orderProjectService.memberLog(id));
+
+	}
+
+	/**
+	 * 会员项目列表
 	 * @param in
 	 * @return
 	 */

+ 5 - 0
src/main/java/com/goafanti/order/service/OrderProjectService.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.bo.UserOrderTask;
+import com.goafanti.common.model.MemberLog;
 import com.goafanti.common.model.TOrderTask;
 import com.goafanti.common.model.TTaskHours;
 import com.goafanti.core.mybatis.page.Pagination;
@@ -91,4 +92,8 @@ public interface OrderProjectService {
     int updateMemberProject(TOrderTask t);
 
 	int pushExamineMemberProject(InputMenber in);
+
+	void addMemberLog(Integer id,Integer status ,String remarks);
+
+	List<MemberLogBo> memberLog(Integer id);
 }

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

@@ -26,6 +26,7 @@ import com.goafanti.common.model.*;
 import com.goafanti.common.utils.excel.NewExcelUtil;
 import com.goafanti.order.bo.*;
 import com.goafanti.order.enums.*;
+import com.goafanti.order.service.OrderProjectService;
 import com.goafanti.organization.bo.*;
 import com.goafanti.common.utils.StringUtils;
 import groovy.transform.Synchronized;
@@ -133,6 +134,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	private BusinessProjectMapper businessProjectMapper;
 	@Autowired
 	private BusinessCategoryMapper businessCategoryMapper;
+	@Autowired
+	private OrderProjectService orderProjectService;
 	@Value(value = "${upload.path}")
 	private String					uploadPath			= null;
 
@@ -217,12 +220,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@Override
 	public int addMemberProject(TOrderTask t){
-		TOrderLog tl=new TOrderLog();
-		tl.setOrderNo(t.getOrderNo());
-		tl.setProcess(OrderLogProcess.HYXMFQ.getCode());
-		tl.setAid(TokenManager.getAdminId());
-		addOrderLog(tl,"发起会员项目");
 		TOrderNewBo tn = tOrderNewMapper.getSaleIdByOno(t.getOrderNo());
+		orderProjectService.addMemberLog(t.getId(),0,"新增会员项目");
 		addNoticMember(NoticeStatus.MENBER_START.getCode(),tn,null,0);
 		return addOrderTask( t);
 	}
@@ -521,6 +520,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	}
 
+
 	@Override
 	public TOrderNewBo getOrderNewDetail(String orderNo) {
 		TOrderNewBo tOrder= tOrderNewMapper.getOrderNewDetail(orderNo);

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

@@ -17,6 +17,7 @@ import com.goafanti.admin.bo.AdminListBo;
 import com.goafanti.common.bo.*;
 import com.goafanti.common.bo.Error;
 import com.goafanti.common.dao.*;
+import com.goafanti.common.model.*;
 import com.goafanti.common.utils.*;
 import com.goafanti.common.utils.excel.NewExcelUtil;
 import com.goafanti.order.bo.*;
@@ -35,29 +36,6 @@ import com.goafanti.common.enums.ChannelStatus;
 import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.enums.OrderLogProcess;
 import com.goafanti.common.error.BusinessException;
-import com.goafanti.common.model.Admin;
-import com.goafanti.common.model.BusinessProject;
-import com.goafanti.common.model.Notice;
-import com.goafanti.common.model.OrganizationContactBook;
-import com.goafanti.common.model.OrganizationIdentity;
-import com.goafanti.common.model.ProjcetCheckLog;
-import com.goafanti.common.model.TArrearsDun;
-import com.goafanti.common.model.TOrderBonus;
-import com.goafanti.common.model.TOrderLog;
-import com.goafanti.common.model.TOrderMid;
-import com.goafanti.common.model.TOrderNew;
-import com.goafanti.common.model.TOrderTask;
-import com.goafanti.common.model.TTaskHours;
-import com.goafanti.common.model.TTaskLog;
-import com.goafanti.common.model.TTaskMid;
-import com.goafanti.common.model.TaskAttributionLog;
-import com.goafanti.common.model.TaskHoursCount;
-import com.goafanti.common.model.TaskLog;
-import com.goafanti.common.model.TaskProgress;
-import com.goafanti.common.model.TaskProgressLog;
-import com.goafanti.common.model.UserBusiness;
-import com.goafanti.common.model.UserChannel;
-import com.goafanti.common.model.UserLockRelease;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
@@ -131,6 +109,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	@Autowired
 	private PublicReleaseMapper	publicReleaseMapper;
 	@Autowired
+	private MemberLogMapper memberLogMapper;
+	@Autowired
 	private AsyncUtils	asyncUtils;
 	@Value(value = "${upload.path}")
 	private String 					uploadPath 			= null;
@@ -1088,70 +1068,67 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	@Override
 	public int pushExamineMemberProject(InputMenber in) {
 		TOrderTask task=tOrderTaskMapper.selectByPrimaryKey(in.getId());
-		TOrderLog log=new TOrderLog();
-		log.setRemarks(in.getRemarks());
-		log.setOrderNo(task.getOrderNo());
-		log.setAid(TokenManager.getAdminId());
+		Integer status=1;
 		TOrderTask nt=new TOrderTask();
 		nt.setId(task.getId());
 		Integer result=0;
+		Integer notice=NoticeStatus.MENBER_YES.getCode();
 		TOrderNewBo ono = tOrderNewMapper.getSaleIdByOno(task.getOrderNo());
 		// 1=通过 0=驳回
 		if (in.getResult()==1){
 			//0=财务 1=特批
 			if (in.getType()==0){
 				if(task.getProcessStatus()!=1)throw  new BusinessException("审核状态错误");
-				log.setProcess(19);
 				if (task.getMemberType()==1||task.getMemberType()==2){
 					nt.setProcessStatus(2);
-					addLog(log,0);
 				}else if (task.getMemberType()==0){
 					nt.setProcessStatus(3);
-					addLog(log,1);
+					status=3;
 					result=1;
 				}
 			}else if(in.getType()==1){
 				if(task.getProcessStatus()!=2)throw  new BusinessException("审核状态错误");
 				nt.setProcessStatus(3);
-				log.setProcess(20);
-				addLog(log,1);
+				status=3;
+
 				result=1;
 			}
-			orderNewService.addNoticMember(NoticeStatus.MENBER_YES.getCode(), ono, in.getType(),result);
 		}else if (in.getResult()==0){
-			if (in.getType()==0){
-				log.setProcess(21);
-			}else if(in.getType()==1){
-				log.setProcess(22);
-			}
-			addLog(log,0);
+			status=2;
 			nt.setProcessStatus(4);
-			orderNewService.addNoticMember(NoticeStatus.MENBER_NO.getCode(), ono, in.getType(),result);
+			notice=NoticeStatus.MENBER_NO.getCode();
 		}
+		orderNewService.addNoticMember(notice, ono, in.getType(),result);
+		addMemberLog(in.getId(),status,in.getRemarks());
 		return tOrderTaskMapper.updateByPrimaryKeySelective(nt);
 	}
 
-	/**
-	 *
-	 * @param log
-	 * @param type 0只做审核 1并完成
-	 */
-	private void addLog(TOrderLog log,Integer type) {
-		if (type==1){
-			log.setProcess(23);
-		}
-		tOrderLogMapper.insertSelective(log);
-	}
+
 
 	@Override
 	public int updateMemberProject(TOrderTask t) {
 		TOrderTask task=tOrderTaskMapper.selectByPrimaryKey(t.getId());
 		if(task.getProcessStatus()!=4)throw  new BusinessException("审核状态错误,无法提交。");
-		addOrderLog(task.getOrderNo(),OrderLogProcess.HYXMFQ.getCode(), "修改重新发起");
+		addMemberLog(t.getId(),0,"修改重新发起");
 		t.setProcessStatus(1);
 		TOrderNewBo ono = tOrderNewMapper.getSaleIdByOno(task.getOrderNo());
 		orderNewService.addNoticMember(NoticeStatus.MENBER_START.getCode(), ono, null,0);
 		return orderNewService.updateOrderTask(t);
 	}
+	@Override
+	public void addMemberLog(Integer id,Integer status ,String remarks){
+		MemberLog log = new MemberLog();
+		log.setPid(id);
+		log.setStatus(status);
+		log.setRemarks(remarks);
+		log.setAid(TokenManager.getAdminId());
+		memberLogMapper.insertSelective(log);
+	}
+
+	@Override
+	public List<MemberLogBo> memberLog(Integer id) {
+		return memberLogMapper.memberLog(id);
+	}
+
 
 }