Explorar el Código

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

anderx hace 3 años
padre
commit
660c7c8656
Se han modificado 22 ficheros con 257 adiciones y 176 borrados
  1. 2 1
      src/main/java/com/goafanti/admin/service/DepartmentService.java
  2. 7 13
      src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java
  3. 5 1
      src/main/java/com/goafanti/admin/service/impl/DepartmentServiceImpl.java
  4. 4 2
      src/main/java/com/goafanti/common/constant/AFTConstants.java
  5. 4 1
      src/main/java/com/goafanti/common/controller/BaseController.java
  6. 1 1
      src/main/java/com/goafanti/common/dao/NewOrderChangeMapper.java
  7. 21 7
      src/main/java/com/goafanti/common/mapper/NewOrderChangeMapper.xml
  8. 7 7
      src/main/java/com/goafanti/common/mapper/OrderChangeLogMapper.xml
  9. 19 6
      src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml
  10. 13 0
      src/main/java/com/goafanti/common/model/NewOrderChange.java
  11. 16 3
      src/main/java/com/goafanti/common/model/PublicRelease.java
  12. 2 0
      src/main/java/com/goafanti/core/cache/serializer/FastJsonRedisSerializer.java
  13. 6 4
      src/main/java/com/goafanti/order/enums/OrderChangeType.java
  14. 102 91
      src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java
  15. 8 5
      src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java
  16. 0 7
      src/main/java/com/goafanti/order/service/impl/UserStatisticsServiceImpl.java
  17. 23 21
      src/main/java/com/goafanti/permission/controller/NewPermissionApiController.java
  18. 0 2
      src/main/java/com/goafanti/permission/service/impl/PermissionServiceImpl.java
  19. 10 0
      src/main/java/com/goafanti/weChat/bo/OutPublicDtails.java
  20. 5 2
      src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java
  21. 1 1
      src/main/resources/props/config_local.properties
  22. 1 1
      src/main/resources/props/config_test.properties

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

@@ -55,8 +55,9 @@ public interface DepartmentService {
 
 	/**
 	 * 获取财务管理部门
-	 * @param adminId
 	 * @return
 	 */
 	List<String> getFinanceDep(String aid);
+
+
 }

+ 7 - 13
src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java

@@ -6,6 +6,7 @@ import javax.annotation.Resource;
 
 import com.goafanti.admin.service.DepartmentService;
 import com.goafanti.common.dao.*;
+import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.Department;
 import com.goafanti.common.utils.RedisUtil;
 import org.springframework.beans.BeanUtils;
@@ -364,19 +365,7 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 		return (Pagination<AdminCustomerBo>)findPage("selectAdminCustomerList", "selectAdminCustomerCount", params, pageNo, pageSize);
 	}
 	@Override
-	@Cacheable(cacheNames = "selectAllUser#500",key = "'selectAllUser:depId:'+#depId+'startTime:'+#startTime+" +"'endTime:'+#endTime+'aName:'+#aName")
 	public DepCountBo selectAllUser(String depId, String startTime, String endTime,String aName) {
-    	String str="selectAllUser"+depId+startTime+endTime+aName;
-		DepCountBo depCountBo=redisUtil.getJsonArray(str,DepCountBo.class);
-		if (depCountBo==null){
-			depCountBo=getselectAllUser(depId,startTime,endTime,aName);
-			redisUtil.saveJsonArray(depCountBo,str);
-		}
-		return depCountBo;
-	}
-
-
-	public DepCountBo getselectAllUser(String depId, String startTime, String endTime,String aName) {
 		DepCountBo acb=new DepCountBo();
 		if (endTime!=null)endTime=endTime+" 23:59:59";
 		List<DepCountBo >deps=new ArrayList<>();
@@ -388,11 +377,16 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 			OrganizationListOut oo=departmentMapper.selectAllById(depId);
 			acb.setName(oo.getName());
 			acb.setId(depId);
-			deps=departmentMapper.selectBysuperId(oo.getId());
+			if(TokenManager.hasRole(AFTConstants.OPERATION_MANAGER)){
+				List<String> myShiroDep = departmentService.selectMyDeps();
+				if (!myShiroDep.contains(depId))throw new BusinessException("无权查看此部门信息");
+
+			}
 			depIds =departmentService.selectSubordinateDeps(depId);
 			Department department = new Department();
 			department.setId(depId);
 			depIds.add(department);
+			deps=departmentMapper.selectBysuperId(oo.getId());
 		}
 		List<AdminCustomerBo> list =departmentMapper.AlldepCount(depIds,startTime,  endTime);
 		for (AdminCustomerBo ad : list) {

+ 5 - 1
src/main/java/com/goafanti/admin/service/impl/DepartmentServiceImpl.java

@@ -145,8 +145,12 @@ public class DepartmentServiceImpl extends BaseMybatisDao<WorkingHoursMapper> im
 
 	@Override
 	public List<String> getFinanceDep(String aid) {
-
 		return departmentMapper.getFinanceDep(aid);
 	}
 
+
+
+
+
+
 }

+ 4 - 2
src/main/java/com/goafanti/common/constant/AFTConstants.java

@@ -21,7 +21,7 @@ public class AFTConstants {
 	public static final String	APPROVAL_DECISION_AUDITOR			= "99989";
 	/**	总裁 */
 	public static final String	CED									= "99998";
-	/**	总裁助 */
+	/**	总裁助 */
 	public static final String	CED_ASSISTANT						= "99988";
 	/**	集团副总 */
 	public static final String	VICE_CEO							= "99997";
@@ -50,11 +50,13 @@ public class AFTConstants {
 	/**	外包审核员 */
 	public static final String  OUTSOURCE_AUDITOR                   = "9991";
 	/** 人事管理员*/
-	public static final String  PERSONNEL_AUDITOR                 = "9990";
+	public static final String  PERSONNEL_AUDITOR              	  	= "9990";
 	/** 专利管理员 */
 	public static final String  PATENT_AUDITOR 	                  	= "9992";
 	/** 公司管理 */
 	public static final String  COMPANY_MANAGER 	                = "9993";
+	/** 运营管理 */
+	public static final String  OPERATION_MANAGER		            = "9989";
 	/** 渠道专员 */
 	public static final String  CHANNEL                      		= "80";
 	/** 渠道总监 */

+ 4 - 1
src/main/java/com/goafanti/common/controller/BaseController.java

@@ -152,7 +152,7 @@ public class BaseController {
 	/**
 	 *	获取权利列表
 	 * @return String  返回权限列表 逗号隔开 1=营销员,2=营销经理,3=营销管理员,4=营销总监,5=财务专员,6=财务经理,7=财务管理员,
-	 * 					8=技术员,9=技术经理,10=技术管理员
+	 * 					8=技术员,9=技术经理,10=技术管理员,11=运营管理,12=总裁助理,13=总裁
 	 */
 	public String shiroAddRedis() {
 		redisUtil.deleteString("shiroList");
@@ -167,6 +167,9 @@ public class BaseController {
 		if (TokenManager.hasRole(AFTConstants.TECH))str=str.append(8).append(",");
 		if (TokenManager.hasRole(AFTConstants.TECH_MANAGER))str=str.append(9).append(",");
 		if (TokenManager.hasRole(AFTConstants.TECH_ADMIN))str=str.append(10).append(",");
+		if (TokenManager.hasRole(AFTConstants.OPERATION_MANAGER))str=str.append(11).append(",");
+		if (TokenManager.hasRole(AFTConstants.CED_ASSISTANT))str=str.append(12).append(",");
+		if (TokenManager.hasRole(AFTConstants.CED))str=str.append(13).append(",");
 		if (str.length()<1)return "";
 		String shiroList=str.substring(0,str.length()-1);
 		redisUtil.setString("shiroList",shiroList);

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

@@ -40,4 +40,4 @@ public interface NewOrderChangeMapper {
     NewOrderChangeBo selectByChangeId(String changeId);
 
     NewOrderChangeBo selectByorderNoAndStatus(String orderNo);
-}
+}

+ 21 - 7
src/main/java/com/goafanti/common/mapper/NewOrderChangeMapper.xml

@@ -34,13 +34,15 @@
     <result column="refund_url" jdbcType="VARCHAR" property="refundUrl" />
     <result column="back_status" jdbcType="INTEGER" property="backStatus" />
     <result column="attachment_url" jdbcType="VARCHAR" property="attachmentUrl" />
+    <result column="contract_picture_url" jdbcType="VARCHAR" property="contractPictureUrl" />
   </resultMap>
   <sql id="Base_Column_List">
     id, order_no, process_state, `status`, `type`, create_time, remarks, voucher_url,
     total_amount, settlement_amount, change_amount, applicant, dep_name, project_state,
     zxs_cost, zxs_remarks, payment_time, payment_amount, invoice_time, invoice_amount,
     invoice_type, cw_cost, refundable_amount, cw_remarks, estimate_cost, estimate_refundable,
-    refund_Invoice, used_order, refund_status, refund_url, back_status, attachment_url
+    refund_Invoice, used_order, refund_status, refund_url, back_status, attachment_url,
+    contract_picture_url
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
@@ -63,7 +65,7 @@
       refundable_amount, cw_remarks, estimate_cost,
       estimate_refundable, refund_Invoice, used_order,
       refund_status, refund_url, back_status,
-      attachment_url)
+      attachment_url, contract_picture_url)
     values (#{orderNo,jdbcType=VARCHAR}, #{processState,jdbcType=INTEGER}, #{status,jdbcType=INTEGER},
       #{type,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR},
       #{voucherUrl,jdbcType=VARCHAR}, #{totalAmount,jdbcType=DECIMAL}, #{settlementAmount,jdbcType=DECIMAL},
@@ -74,7 +76,7 @@
       #{refundableAmount,jdbcType=DECIMAL}, #{cwRemarks,jdbcType=VARCHAR}, #{estimateCost,jdbcType=DECIMAL},
       #{estimateRefundable,jdbcType=DECIMAL}, #{refundInvoice,jdbcType=DECIMAL}, #{usedOrder,jdbcType=VARCHAR},
       #{refundStatus,jdbcType=INTEGER}, #{refundUrl,jdbcType=VARCHAR}, #{backStatus,jdbcType=INTEGER},
-      #{attachmentUrl,jdbcType=VARCHAR})
+      #{attachmentUrl,jdbcType=VARCHAR}, #{contractPictureUrl,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.NewOrderChange" useGeneratedKeys="true">
     insert into new_order_change
@@ -172,6 +174,9 @@
       <if test="attachmentUrl != null">
         attachment_url,
       </if>
+      <if test="contractPictureUrl != null">
+        contract_picture_url,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="orderNo != null">
@@ -267,6 +272,9 @@
       <if test="attachmentUrl != null">
         #{attachmentUrl,jdbcType=VARCHAR},
       </if>
+      <if test="contractPictureUrl != null">
+        #{contractPictureUrl,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.NewOrderChange">
@@ -365,6 +373,9 @@
       <if test="attachmentUrl != null">
         attachment_url = #{attachmentUrl,jdbcType=VARCHAR},
       </if>
+      <if test="contractPictureUrl != null">
+        contract_picture_url = #{contractPictureUrl,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -400,7 +411,8 @@
       refund_status = #{refundStatus,jdbcType=INTEGER},
       refund_url = #{refundUrl,jdbcType=VARCHAR},
       back_status = #{backStatus,jdbcType=INTEGER},
-      attachment_url = #{attachmentUrl,jdbcType=VARCHAR}
+      attachment_url = #{attachmentUrl,jdbcType=VARCHAR},
+      contract_picture_url = #{contractPictureUrl,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="selectByorderNo" resultType="com.goafanti.order.bo.NewOrderChangeBo">
@@ -411,7 +423,8 @@ select
 	a.change_amount changeAmount, a.applicant, a.dep_name depName, a.project_state projectState, a.zxs_cost zxsCost,
 	a.zxs_remarks zxsRemarks, date_format(a.payment_time, '%Y-%m-%d')paymentTimes, a.payment_amount paymentAmount,
 	date_format(a. invoice_time, '%Y-%m-%d') invoiceTimes, a.invoice_amount invoiceAmount,a.invoice_type invoiceType,
-	a.cw_remarks cwRemarks from new_order_change a where 1 = 1
+	a.cw_remarks cwRemarks,a.contract_picture_url contractPictureUrl
+    from new_order_change a where 1 = 1
 	and a.order_no= #{orderNo}
 	order by a.create_time desc limit 1
   </select>
@@ -423,7 +436,8 @@ select
 	a.change_amount changeAmount, a.applicant, a.dep_name depName, a.project_state projectState, a.zxs_cost zxsCost,
 	a.zxs_remarks zxsRemarks, date_format(a.payment_time, '%Y-%m-%d')paymentTimes, a.payment_amount paymentAmount,
 	date_format(a. invoice_time, '%Y-%m-%d') invoiceTimes, a.invoice_amount invoiceAmount,a.invoice_type invoiceType,
-	a.cw_remarks cwRemarks,a.back_status backStatus from new_order_change a where 1 = 1 and status!=4
+	a.cw_remarks cwRemarks,a.back_status backStatus ,a.contract_picture_url contractPictureUrl
+    from new_order_change a where 1 = 1 and status!=4
 	and a.id= #{ChangeId}
 	order by a.create_time desc
   </select>
@@ -449,7 +463,7 @@ select
 	a.change_amount changeAmount, a.applicant, a.dep_name depName, a.project_state projectState, a.zxs_cost zxsCost,
 	a.zxs_remarks zxsRemarks, date_format(a.payment_time, '%Y-%m-%d')paymentTimes, a.payment_amount paymentAmount,
 	date_format(a. invoice_time, '%Y-%m-%d') invoiceTimes, a.invoice_amount invoiceAmount,a.invoice_type invoiceType,
-	a.cw_remarks cwRemarks,a.estimate_cost estimateCost,estimate_refundable estimateRefundable,refund_Invoice refundInvoice
+	a.cw_remarks cwRemarks,a.estimate_cost estimateCost,estimate_refundable estimateRefundable,refund_Invoice refundInvoice,a.contract_picture_url contractPictureUrl
 	from new_order_change a where 1 = 1 and a.id= #{id}
   </select>
   <select id="checkOderNo" resultType="java.lang.Integer">

+ 7 - 7
src/main/java/com/goafanti/common/mapper/OrderChangeLogMapper.xml

@@ -116,7 +116,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Fri Aug 16 14:22:36 CST 2019.
     -->
-    select 
+    select
     <include refid="Base_Column_List" />
     from order_change_log
     where id = #{id,jdbcType=INTEGER}
@@ -147,11 +147,11 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Fri Aug 16 14:22:36 CST 2019.
     -->
-    insert into order_change_log (id, change_id, order_no, 
-      status, create_time, remarks, 
+    insert into order_change_log (id, change_id, order_no,
+      status, create_time, remarks,
       auditor)
-    values (#{id,jdbcType=INTEGER}, #{changeId,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, 
-      #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR}, 
+    values (#{id,jdbcType=INTEGER}, #{changeId,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR},
+      #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR},
       #{auditor,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.OrderChangeLog">
@@ -316,10 +316,10 @@
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="selectOrderChangeLogList" resultType="com.goafanti.order.bo.OrderChangeLogBo">
-  select a.id,a.change_id changeId,a.order_no orderNo,a.status,a.remarks,a.auditor,a.create_time createTime,
+  select  a.id,a.change_id changeId,a.order_no orderNo,a.status,a.remarks,a.auditor,a.create_time createTime,
 		date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimes ,b.name aname
 		from order_change_log a left join admin b on a.auditor=b.id
 		where a.change_id= #{changeId}
 		order by a.create_time
   </select>
-</mapper>
+</mapper>

+ 19 - 6
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

@@ -44,6 +44,7 @@
     <result column="assistant_aid" jdbcType="VARCHAR" property="assistantAid" />
     <result column="assistant_name" jdbcType="VARCHAR" property="assistantName" />
     <result column="public_again" jdbcType="INTEGER" property="publicAgain" />
+    <result column="audit_time" jdbcType="TIMESTAMP" property="auditTime" />
   </resultMap>
   <sql id="Base_Column_List">
     id, `uid`, aid, release_start, release_end, remarks, annex_url, user_name, longitude,
@@ -51,7 +52,7 @@
     ufid, duration, valid_date, new_user, sign_sum, main_status, supplement, audit_info,
     `plan`, expected_effect, next_plan, `type`, order_no, update_time, update_status,
     assist, assist_aid, assist_aid_name, main_id, main_name, clock_in_remarks, reject_name,
-    assistant_aid, assistant_name, public_again
+    assistant_aid, assistant_name, public_again, audit_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
@@ -77,7 +78,8 @@
       update_status, assist, assist_aid,
       assist_aid_name, main_id, main_name,
       clock_in_remarks, reject_name, assistant_aid,
-      assistant_name, public_again)
+      assistant_name, public_again, audit_time
+      )
     values (#{uid,jdbcType=VARCHAR}, #{aid,jdbcType=VARCHAR}, #{releaseStart,jdbcType=TIMESTAMP},
       #{releaseEnd,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR}, #{annexUrl,jdbcType=VARCHAR},
       #{userName,jdbcType=VARCHAR}, #{longitude,jdbcType=VARCHAR}, #{latitude,jdbcType=VARCHAR},
@@ -91,7 +93,8 @@
       #{updateStatus,jdbcType=INTEGER}, #{assist,jdbcType=INTEGER}, #{assistAid,jdbcType=VARCHAR},
       #{assistAidName,jdbcType=VARCHAR}, #{mainId,jdbcType=INTEGER}, #{mainName,jdbcType=VARCHAR},
       #{clockInRemarks,jdbcType=VARCHAR}, #{rejectName,jdbcType=VARCHAR}, #{assistantAid,jdbcType=VARCHAR},
-      #{assistantName,jdbcType=VARCHAR}, #{publicAgain,jdbcType=INTEGER})
+      #{assistantName,jdbcType=VARCHAR}, #{publicAgain,jdbcType=INTEGER}, #{auditTime,jdbcType=TIMESTAMP}
+      )
   </insert>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.PublicRelease" useGeneratedKeys="true">
     insert into public_release
@@ -219,6 +222,9 @@
       <if test="publicAgain != null">
         public_again,
       </if>
+      <if test="auditTime != null">
+        audit_time,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="uid != null">
@@ -344,6 +350,9 @@
       <if test="publicAgain != null">
         #{publicAgain,jdbcType=INTEGER},
       </if>
+      <if test="auditTime != null">
+        #{auditTime,jdbcType=TIMESTAMP},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.PublicRelease">
@@ -472,6 +481,9 @@
       <if test="publicAgain != null">
         public_again = #{publicAgain,jdbcType=INTEGER},
       </if>
+      <if test="auditTime != null">
+        audit_time = #{auditTime,jdbcType=TIMESTAMP},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -517,7 +529,8 @@
       reject_name = #{rejectName,jdbcType=VARCHAR},
       assistant_aid = #{assistantAid,jdbcType=VARCHAR},
       assistant_name = #{assistantName,jdbcType=VARCHAR},
-      public_again = #{publicAgain,jdbcType=INTEGER}
+      public_again = #{publicAgain,jdbcType=INTEGER},
+      audit_time = #{auditTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
 
@@ -728,8 +741,8 @@
   <select id="listPublicDtails" resultType="com.goafanti.weChat.bo.OutPublicDtails">
     select a.id,b.nickname ,a.user_name userName,c.name aname,a.duration ,a.status,a.annex_url annexUrl,a.photo_url photoUrl,
     date_format(a.clock_in_time ,'%Y-%m-%d %H:%i:%S') clockInTimes,a.clock_in clockIn,a.remarks,a.supplement,a.type,
-    date_format(a.create_time ,'%Y-%m-%d %H:%i:%S') createTimes,a.audit_info auditInfo,d.name sname,
-    date_format(a.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,date_format(a.release_end ,'%Y-%m-%d %H:%i:%S') releaseEnds,
+    date_format(a.create_time ,'%Y-%m-%d %H:%i:%S') createTimes,a.audit_info auditInfo,date_format(a.audit_time ,'%Y-%m-%d %H:%i:%S') auditTimes,
+    d.name sname, date_format(a.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,date_format(a.release_end ,'%Y-%m-%d %H:%i:%S') releaseEnds,
     a.plan ,a.next_plan nextPlan ,a.expected_effect expectedEffect,a.update_status updateStatus,a.assist_aid_name assistAidName,
     a.main_name mainName,a.assist,a.assistant_aid assistantAid, a.assistant_name assistantName
     from public_release a left join `user` b on a.uid=b.id left join admin c on a.aid =c.id

+ 13 - 0
src/main/java/com/goafanti/common/model/NewOrderChange.java

@@ -169,6 +169,11 @@ public class NewOrderChange implements Serializable {
      */
     private String attachmentUrl;
 
+    /**
+     * 合同图片
+     */
+    private String contractPictureUrl;
+
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {
@@ -426,4 +431,12 @@ public class NewOrderChange implements Serializable {
     public void setAttachmentUrl(String attachmentUrl) {
         this.attachmentUrl = attachmentUrl;
     }
+
+    public String getContractPictureUrl() {
+        return contractPictureUrl;
+    }
+
+    public void setContractPictureUrl(String contractPictureUrl) {
+        this.contractPictureUrl = contractPictureUrl;
+    }
 }

+ 16 - 3
src/main/java/com/goafanti/common/model/PublicRelease.java

@@ -5,7 +5,7 @@ import java.util.Date;
 
 /**
  * public_release
- * @author
+ * @author 
  */
 public class PublicRelease implements Serializable {
     private Integer id;
@@ -146,7 +146,7 @@ public class PublicRelease implements Serializable {
     private String nextPlan;
 
     /**
-     * 分类 0业务 1技术 2行政 3 协单
+     * 分类 0业务 1技术 2行政 3 技术协单 4 技术助手
      */
     private Integer type;
 
@@ -215,6 +215,11 @@ public class PublicRelease implements Serializable {
      */
     private Integer publicAgain;
 
+    /**
+     * 审核时间
+     */
+    private Date auditTime;
+
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {
@@ -552,4 +557,12 @@ public class PublicRelease implements Serializable {
     public void setPublicAgain(Integer publicAgain) {
         this.publicAgain = publicAgain;
     }
-}
+
+    public Date getAuditTime() {
+        return auditTime;
+    }
+
+    public void setAuditTime(Date auditTime) {
+        this.auditTime = auditTime;
+    }
+}

+ 2 - 0
src/main/java/com/goafanti/core/cache/serializer/FastJsonRedisSerializer.java

@@ -27,6 +27,8 @@ public class FastJsonRedisSerializer implements RedisSerializer<Object> {
 		pc.addAccept("com.goafanti.order.bo.outProvinceStatisticsList");
 		pc.addAccept("com.goafanti.weChat.bo.OutPublicStatistics");
 		pc.addAccept("com.goafanti.core.mybatis.page.Pagination");
+		pc.addAccept("com.goafanti.common.bo.Result");
+		pc.addAccept("com.goafanti.permission.bo.PermissionBo");
 		pc.addAccept("java.util.Map");
 
 	}

+ 6 - 4
src/main/java/com/goafanti/order/enums/OrderChangeType.java

@@ -4,16 +4,18 @@ import java.util.HashMap;
 import java.util.Map;
 
 public enum OrderChangeType {
-	//变更类型 0退单退款 1项目及金额变更 2仅项目变更 3仅金额变更 4重报 5赠送
+	//变更类型 0退单退款 1项目及金额变更 2仅项目变更 3仅金额变更 4重报 5赠送 6退单不退款 7仅变更合同
 	TDTK(0,"退单退款"),
 	XMJJEBG(1,"项目及金额变更"),
 	JXMBG(2,"仅项目变更"),
 	JJEBG(3,"仅金额变更"),
 	CB(4,"重报"),
 	ZS(5,"赠送"),
+	TDBTK(6,"退单不退款"),
+	JBGGT(7,"仅变更合同"),
 	/** 无效 **/
 	INVALID(10, "INVALID");
-	
+
 	private OrderChangeType(Integer code, String desc) {
 		this.code = code;
 		this.desc = desc;
@@ -32,7 +34,7 @@ public enum OrderChangeType {
 		}
 		return INVALID;
 	}
-	
+
 	public static String getValueByCode(Integer code){
         for(OrderChangeType orderChangeType:OrderChangeType.values()){
             if(code.equals(orderChangeType.getCode())){
@@ -41,7 +43,7 @@ public enum OrderChangeType {
         }
         return  null;
     }
-	
+
 	public static boolean containsType(Integer code) {
 		return status.containsKey(code);
 	}

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

@@ -97,8 +97,6 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	@Autowired
 	private TTaskMidMapper	tTaskMidMapper;
 	@Autowired
-	private UserLockReleaseMapper	userLockReleaseMapper;
-	@Autowired
 	private PushOrderService pushOrderService;
 	@Autowired
 	private TOrderMidMapper tOrderMidMapper;
@@ -109,7 +107,6 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	@Autowired
 	private OrderProjectService orderProjectService;
 
-	Logger							logger	= LoggerFactory.getLogger(OrderChangeServiceImpl.class);
 
 	@Override
 	public int addOrderChange(NewOrderChangeBo t,String startRemarks) {
@@ -128,67 +125,66 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		t.setZxsRemarks(startRemarks);
 		newOrderChangeMapper.insertSelective(t);
 		NewOrderChangeBo ncb=newOrderChangeMapper.selectByorderNoAndStatus(t.getOrderNo());
-
-			List<OutNewOrderDunBo> listDun=newOrderDunMapper.selectListNewOrderDun(t.getOrderNo(),null);
-			List<TChangeDun> listcd=new ArrayList<>();
-			if (listDun!=null&&!listDun.isEmpty()) {
-				for (OutNewOrderDunBo d : listDun) {
-					TChangeDun cd=new TChangeDun();
-					cd.setOrderNo(d.getOrderNo());
-					cd.setAid(d.getAid());
-					cd.setAppropriationRatio(d.getAppropriationRatio());
-					cd.setCid(ncb.getId());
-					cd.setDid(d.getId());
-					cd.setTid(d.getTid());
-					cd.setProjectType(d.getProjectType());
-					cd.setDunType(d.getDunType());
-					cd.setMoney(d.getMoney());
-					cd.setWaitDay(d.getWaitDay());
-					cd.setStartTime(d.getStartTime());
-					cd.setEffectiveCount(d.getEffectiveCount());
-					cd.setCustomizeTime(d.getCustomizeTime());
-					cd.setCustomizeName(d.getCustomizeName());
-					listcd.add(cd);
-				}
-				tChangeDunMapper.insertSelectiveList(listcd);
-			}
-			List<TChangeTask> listck=new ArrayList<>();
-			List<TOrderTaskBo> listTask=tOrderTaskMapper.selectOrderTaskAll(t.getOrderNo(),null);
-			if (listTask!=null&&!listTask.isEmpty()) {
-				for (TOrderTaskBo tt : listTask) {
-					TChangeTask ck=new TChangeTask();
-					ck.setOrderNo(tt.getOrderNo());
-					ck.setCid(ncb.getId());
-					ck.setCommodityId(tt.getCommodityId());
-					ck.setOrderNo(tt.getOrderNo());
-					ck.setCommodityName(tt.getCommodityName());
-					ck.setCommodityPrice(tt.getCommodityPrice());
-					ck.setCommodityQuantity(tt.getCommodityQuantity());
-					ck.setTaskComment(tt.getTaskComment());
-					ck.setSplitStatus(tt.getSplitStatus());
-					ck.setSplitSuper(tt.getSplitSuper());
-					ck.setReceiverName(tt.getReceiverName());
-					ck.setMain(tt.getMain());
-					ck.setTid(tt.getId());
-					if(tt.getServiceLife()!=null)	ck.setServiceLife(tt.getServiceLife());
-					if(tt.getServiceYear()!=null)		ck.setServiceYear(tt.getServiceYear());
-					if(tt.getYearSum()!=null)	ck.setYearSum(tt.getYearSum());
-					if(tt.getContractTerm()!=null)	ck.setContractTerm(tt.getContractTerm());
-					listck.add(ck);
-				}
-				tChangeTaskMapper.insertSelectiveList(listck);
+		List<OutNewOrderDunBo> listDun=newOrderDunMapper.selectListNewOrderDun(t.getOrderNo(),null);
+		List<TChangeDun> listcd=new ArrayList<>();
+		if (listDun!=null&&!listDun.isEmpty()) {
+			for (OutNewOrderDunBo d : listDun) {
+				TChangeDun cd=new TChangeDun();
+				cd.setOrderNo(d.getOrderNo());
+				cd.setAid(d.getAid());
+				cd.setAppropriationRatio(d.getAppropriationRatio());
+				cd.setCid(ncb.getId());
+				cd.setDid(d.getId());
+				cd.setTid(d.getTid());
+				cd.setProjectType(d.getProjectType());
+				cd.setDunType(d.getDunType());
+				cd.setMoney(d.getMoney());
+				cd.setWaitDay(d.getWaitDay());
+				cd.setStartTime(d.getStartTime());
+				cd.setEffectiveCount(d.getEffectiveCount());
+				cd.setCustomizeTime(d.getCustomizeTime());
+				cd.setCustomizeName(d.getCustomizeName());
+				listcd.add(cd);
 			}
-			if (t.getType()==OrderChangeType.TDTK.getCode()) {
-				OrderChangeLog ocl=new OrderChangeLog();
-				ocl.setAuditor(TokenManager.getAdminId());
-				ocl.setOrderNo(t.getOrderNo());
-				ocl.setRemarks(startRemarks);
-				ocl.setChangeId(ncb.getId());
-				ocl.setStatus(0);
-				sendNotice(0, t);//设置与通过一样发送信息
-				orderChangeLogMapper.insertSelective(ocl);
+			tChangeDunMapper.insertSelectiveList(listcd);
+		}
+		List<TChangeTask> listck=new ArrayList<>();
+		List<TOrderTaskBo> listTask=tOrderTaskMapper.selectOrderTaskAll(t.getOrderNo(),null);
+		if (listTask!=null&&!listTask.isEmpty()) {
+			for (TOrderTaskBo tt : listTask) {
+				TChangeTask ck=new TChangeTask();
+				ck.setOrderNo(tt.getOrderNo());
+				ck.setCid(ncb.getId());
+				ck.setCommodityId(tt.getCommodityId());
+				ck.setOrderNo(tt.getOrderNo());
+				ck.setCommodityName(tt.getCommodityName());
+				ck.setCommodityPrice(tt.getCommodityPrice());
+				ck.setCommodityQuantity(tt.getCommodityQuantity());
+				ck.setTaskComment(tt.getTaskComment());
+				ck.setSplitStatus(tt.getSplitStatus());
+				ck.setSplitSuper(tt.getSplitSuper());
+				ck.setReceiverName(tt.getReceiverName());
+				ck.setMain(tt.getMain());
+				ck.setTid(tt.getId());
+				if(tt.getServiceLife()!=null)	ck.setServiceLife(tt.getServiceLife());
+				if(tt.getServiceYear()!=null)		ck.setServiceYear(tt.getServiceYear());
+				if(tt.getYearSum()!=null)	ck.setYearSum(tt.getYearSum());
+				if(tt.getContractTerm()!=null)	ck.setContractTerm(tt.getContractTerm());
+				listck.add(ck);
 			}
-		return 1;
+			tChangeTaskMapper.insertSelectiveList(listck);
+		}
+		if (t.getType()==OrderChangeType.TDTK.getCode()) {
+			OrderChangeLog ocl=new OrderChangeLog();
+			ocl.setAuditor(TokenManager.getAdminId());
+			ocl.setOrderNo(t.getOrderNo());
+			ocl.setRemarks(startRemarks);
+			ocl.setChangeId(ncb.getId());
+			ocl.setStatus(0);
+			sendNotice(0, t);//设置与通过一样发送信息
+			orderChangeLogMapper.insertSelective(ocl);
+		}
+	return 1;
 	}
 
 	/*
@@ -216,8 +212,6 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				orderExamineMapper.insertSelective(o);
 			}
 		}
-
-
 	}
 
 	@Override
@@ -264,33 +258,43 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		}
 		//2通过 3驳回
 		if (status==2) {
-			//变更类型 0退单退款 1项目及金额变更 2仅项目变更 3仅金额变更 4重报 5赠送
+			//变更类型 0退单退款 1项目及金额变更 2仅项目变更 3仅金额变更 4重报 5赠送 6退单不退款 7仅变更合同
 			if(nb.getType() !=null){
-				if (nb.getChangeAmount().compareTo(new BigDecimal("0.2"))<0) {//小于则总裁通过,大于则董事长
-					if(nb.getProcessState()==7) {//总裁项目变更通过
-						nb.setStatus(2);
-						}
+				//仅合同变更只需要 营销管理员与财务专员审核
+				if(nb.getType()==OrderChangeType.JBGGT.getCode()){
+					if(nb.getProcessState()==1){
+						nb.setProcessState(5);
+					}else if(nb.getProcessState()==5){
+						nb.setStatus(4);
+						pushCompleteOrderChange(nb);
+						return 1;
+					}
 				}else {
-					if(nb.getProcessState()==7) {
-						nb.setProcessState(nb.getProcessState()+1);
+					if (nb.getChangeAmount().compareTo(new BigDecimal("0.2"))<0) {//小于则总裁通过,大于则董事长
+						if(nb.getProcessState()==7) {//总裁项目变更通过
+							nb.setStatus(2);
+						}
+					}else {
+						if(nb.getProcessState()==7) {
+							nb.setProcessState(nb.getProcessState()+1);
 						}else if(nb.getProcessState()==8) {//董事长项目变更通过
-						nb.setStatus(2);
+							nb.setStatus(2);
 						}
-				}
-				 	//营销管理通过则设置技术管理员通过表
-				 if(nb.getProcessState()==1){
-					 if (orderExamineMapper.checkCountStatus(orderNo,null,null)<1) {
-						 insertOrderExamine(orderNo);
-					 } else {
-						 orderExamineMapper.updateByOrderNo(orderNo,null);
-					 }
-					 nb.setProcessState(nb.getProcessState()+1);
 					}
-				 //必须放置在咨询师与咨询师经理前,否则会直接通过不走咨询师管理员
-				 if(nb.getProcessState()==4||nb.getProcessState()==5||nb.getProcessState()==6) {
-					 nb.setProcessState(nb.getProcessState()+1);
-				 }
-				 if(nb.getProcessState()==2){//咨询师
+					//营销管理通过则设置技术管理员通过表
+					if(nb.getProcessState()==1){
+						if (orderExamineMapper.checkCountStatus(orderNo,null,null)<1) {
+							insertOrderExamine(orderNo);
+						} else {
+							orderExamineMapper.updateByOrderNo(orderNo,null);
+						}
+						nb.setProcessState(nb.getProcessState()+1);
+					}
+					//必须放置在咨询师与咨询师经理前,否则会直接通过不走咨询师管理员
+					if(nb.getProcessState()==4||nb.getProcessState()==5||nb.getProcessState()==6) {
+						nb.setProcessState(nb.getProcessState()+1);
+					}
+					if(nb.getProcessState()==2){//咨询师
 						//找出当时人的审核改为通过
 						orderExamineMapper.updateByOrderNoAndAid(orderNo,TokenManager.getAdminId(),0);
 						//全部通过了则跳下个流程
@@ -298,7 +302,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 							nb.setProcessState(nb.getProcessState()+1);
 						}
 					}
-				 if(nb.getProcessState()==3){//咨询师经理
+					if(nb.getProcessState()==3){//咨询师经理
 						//找出当时人的审核改为通过
 						orderExamineMapper.updateByOrderNoAndAid(orderNo,TokenManager.getAdminId(),1);
 						//全部通过了则跳下个流程
@@ -306,7 +310,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 							nb.setProcessState(nb.getProcessState()+1);
 						}
 					}
-
+				}
 			}
 			if(nb.getStatus()==3) {
 				nb.setStatus(1);//如果驳回数据则改为正常数据
@@ -336,7 +340,6 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			}else if (nb.getProcessState()<3) {
 				orderExamineMapper.updateByOrderNo(orderNo,null);
 			}
-
 		}
 		OrderChangeLog ocl=new OrderChangeLog();
 		ocl.setAuditor(TokenManager.getAdminId());
@@ -541,6 +544,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		Pagination<NewOderCahngeListBo> data = (Pagination<NewOderCahngeListBo>)findPage("selectOrderChangeList", "selectOrderChangeCount", parameter, pageNo, pageSize);
 		return data;
 	}
+
 	@Override
 	public int updateOrderChange(NewOrderChangeBo t,Integer changeType,String startRemarks) {
 		NewOrderChange  noc=new NewOrderChange();
@@ -549,6 +553,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		if (changeType==0) {
 //			chekeChangeTaskNumber(noc);
 			noc.setRemarks(t.getRemarks());
+			if(t.getContractPictureUrl()!=null)noc.setContractPictureUrl(t.getContractPictureUrl());
 			noc.setType(t.getType());
 			noc.setVoucherUrl(t.getVoucherUrl());
 			noc.setTotalAmount(t.getTotalAmount());
@@ -622,22 +627,26 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			throw new BusinessException("变更子项目与父项目数量不符");
 		}
 	}
+
 	@Override
 	public int addOrderRefundInvoice(OrderRefundInvoice o) {
 		o.setCreateTime(new Date());
 		newOrderChangeMapper.addRefundInvoice(o.getOrderNo(),o.getAmount());
 		return orderRefundInvoiceMapper.insertSelective(o);
 	}
+
 	@Override
 	public int deleteOrderRefundInvoice(Integer id) {
 		OrderRefundInvoice or=orderRefundInvoiceMapper.selectByPrimaryKey(id);
 		newOrderChangeMapper.subtractRefundInvoice(or.getOrderNo(),or.getAmount());
 		return orderRefundInvoiceMapper.deleteByPrimaryKey(id);
 	}
+
 	@Override
 	public List<OrderRefundInvoice> listOrderRefundInvoice(String orderNo) {
 		return orderRefundInvoiceMapper.selectByorderNo(orderNo);
 	}
+
 	@Override
 	public int pushCompleteOrderChange(NewOrderChangeBo nb) {
 		//变更完成
@@ -658,7 +667,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	}
 
 	/**
-	 * 获取除发起者意外所有审核者
+	 * 获取除当前审核者所有审核者
 	 * @param id
 	 * @return
 	 */
@@ -667,7 +676,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		List<String>newl=new ArrayList<>();
 		List<OrderChangeLogBo>  list=orderChangeLogMapper.selectOrderChangeLogList(id.toString());
 		for (OrderChangeLogBo log : list) {
-			if (!log.getStatus().equals(0)){
+			if (!TokenManager.getAdminId().equals(log.getAuditor())){
 				if (!newl.contains(log.getAuditor())){
 					newl.add(log.getAuditor());
 				}
@@ -742,6 +751,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		um.setTaskNames(taskNames);
 		if (nb.getType()==0)um.setChargeback(1);
 		userMidMapper.updateByUid(um);
+		//如果合同不是空,则修改合同
+		if (nob.getContractPictureUrl()!=null)o.setContractPictureUrl(nob.getContractPictureUrl());
 		tOrderNewMapper.updateByPrimaryKeySelective(o);
 		return o;
 	}

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

@@ -620,6 +620,14 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		TOrderNewBo tOrder= tOrderNewMapper.getOrderNewDetail(orderNo);
 		String url=pushOrderService.processStatusConstant(tOrder.getContractPictureUrl(),tOrder.getSalesmanId(),tOrder.getProcessStatus());
 		tOrder.setContractPictureUrl(url);
+		if (!TokenManager.hasRole(AFTConstants.SUPERADMIN)){
+			if (!tOrder.getSalesmanId().equals(TokenManager.getAdminId())){
+				tOrder.setContacts("***");
+				tOrder.setContactMobile("***");
+				tOrder.setLegalPerson("***");
+				tOrder.setLegalPersonTel("***");
+			}
+		}
 		return tOrder;
 	}
 
@@ -640,7 +648,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				}else {
 					tOrderDunMapper.updateByPrimaryKeySelective(t);
 				}
-
 			}
 		}
 		boolean flag=true;
@@ -658,7 +665,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				}
 				flag=true;
 			}
-
 		}
 		return 1;
 	}
@@ -682,7 +688,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			if(in.getSpecially()==4) {
 				params.put("distribution",in.getDistribution());
 			}
-
 		}else if(in.getSpecially()==8){
 			if (StringUtils.isNotBlank(in.getUid())) {
 				params.put("uid", in.getUid());
@@ -713,7 +718,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				params.put("deps",departmentService.parseArray(in.getDeps()));
 			}
 		}
-
 		if (StringUtils.isNotBlank(in.getContractNo())) {
 			params.put("contractNo", in.getContractNo());
 		}
@@ -855,7 +859,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 					addOrderLog(tl,reason);
 
 				}
-
 			type=NoticeStatus.ORDER_YES.getCode();
 			tl.setOrderNo(orderNo);
 			tl.setProcess(OrderLogProcess.SH.getCode());

+ 0 - 7
src/main/java/com/goafanti/order/service/impl/UserStatisticsServiceImpl.java

@@ -1,14 +1,11 @@
 package com.goafanti.order.service.impl;
 
 import com.goafanti.admin.service.DepartmentService;
-import com.goafanti.common.dao.TOrderNewMapper;
 import com.goafanti.common.dao.UserMidMapper;
-import com.goafanti.common.model.Department;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.order.bo.*;
-import com.goafanti.order.service.OrderStatisticsService;
 import com.goafanti.order.service.UserStaticticsService;
 import groovy.util.logging.Log4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -88,8 +85,4 @@ public class UserStatisticsServiceImpl extends BaseMybatisDao<UserMidMapper> imp
 		addsignStatisticsParam(in, map);
 		return (Pagination<TOrderNewBo>) findPage("selectsignStatisticsOrderList","selectsignStatisticsOrderCount",map,in.getPageNo(),in.getPageSize());
 	}
-
-
-
 }
-

+ 23 - 21
src/main/java/com/goafanti/permission/controller/NewPermissionApiController.java

@@ -3,6 +3,7 @@ package com.goafanti.permission.controller;
 import javax.annotation.Resource;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -24,12 +25,13 @@ public class NewPermissionApiController extends BaseApiController {
 	PermissionMapper		permissionMapper;
 	/**权限管理列表 **/
 	@RequestMapping(value = "/permissions", method = RequestMethod.POST)
+	@Cacheable(cacheNames = "permissions#60",key = "'permissions:'+'all'")
 	public Result permissions() {
 		Result res = new Result();
 		res.setData(permissionService.findPermissionsAll());
 		return res;
 	}
-	
+
 	/**权限管理最上级新增 **/
 	@RequestMapping(value = "/addSupPermission" , method = RequestMethod.POST)
 	public Result addSupPermission(Permission record ){
@@ -51,7 +53,7 @@ public class NewPermissionApiController extends BaseApiController {
 	public Permission selectSuperIdById(String id ){
 		return permissionService.selectSuperIdById(id);
 	}
-	
+
 	/**权限管理新增 **/
 	@RequestMapping(value = "/addPermission" , method = RequestMethod.POST)
 	public Result addPermission(Permission record ){
@@ -83,13 +85,13 @@ public class NewPermissionApiController extends BaseApiController {
 			String aut=autNo+"0"+Count;
 			String sid=permissionMapper.selectIdByAutNo(aut);
 			while(sid!=null){
-				Count=(Count+1)%100;				
+				Count=(Count+1)%100;
 				if(Count>=10){
-					aut=autNo+Count;	
+					aut=autNo+Count;
 				}else{
 					aut=autNo+"0"+Count;
 				}
-				sid=permissionMapper.selectIdByAutNo(aut);			
+				sid=permissionMapper.selectIdByAutNo(aut);
 			}
 			record.setAutNo(aut);
 		}
@@ -97,16 +99,16 @@ public class NewPermissionApiController extends BaseApiController {
 			String aut=autNo+Count;
 			String sid=permissionMapper.selectIdByAutNo(aut);
 			while(sid!=null){
-				Count=(Count+1)%100;			
+				Count=(Count+1)%100;
 				aut=autNo+Count;
-				sid=permissionMapper.selectIdByAutNo(aut);				
+				sid=permissionMapper.selectIdByAutNo(aut);
 			}
 			record.setAutNo(aut);
 		}
 		res.setData(permissionService.insertSubordinate(record));
 		return res;
 	}
-	
+
 	/**删除列表信息**/
 	@RequestMapping(value = "/deleteById" , method = RequestMethod.POST)
 	public Result deleteById(String id){
@@ -128,7 +130,7 @@ public class NewPermissionApiController extends BaseApiController {
 		res.setData(permissionService.deleteById(id));
 		return res;
 	}
-	
+
 	/**编辑页面数据读取**/
 	@RequestMapping(value = "/selectAllById" , method = RequestMethod.POST)
 	public Result selectAllById(String id){
@@ -136,7 +138,7 @@ public class NewPermissionApiController extends BaseApiController {
 		res.setData(permissionService.selectAllById(id));
 		return res;
 	}
-	
+
 	/**上级权限自动补全查询**/
 	@RequestMapping(value = "/selectName" , method = RequestMethod.POST)
 	public Result selectName(String name){
@@ -144,7 +146,7 @@ public class NewPermissionApiController extends BaseApiController {
 		res.setData(permissionService.selectName(name));
 		return res;
 	}
-	
+
 	/**修改信息**/
 	@RequestMapping(value = "/updateById" , method = RequestMethod.POST)
 	public Result updateById(Permission record ){
@@ -158,7 +160,7 @@ public class NewPermissionApiController extends BaseApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_BEING_ERROR,"名称"));
 			return res;
 		}
-		
+
 		String pname=permissionMapper.selectAutNoByNamei(record.getSuperId());
 		if(StringUtils.isBlank(pname)){
 			res.getError().add(buildError("","上级权限不匹配"));
@@ -176,7 +178,7 @@ public class NewPermissionApiController extends BaseApiController {
 				res.getError().add(buildError("","权限层级超限"));
 				return res;
 			}
-			
+
 		}
 		//*********权限编号判断**************
 		String superName=record.getSuperId();//上级名称
@@ -191,13 +193,13 @@ public class NewPermissionApiController extends BaseApiController {
 			String aut=autNo+"0"+Count;
 			String sid=permissionMapper.selectIdByAutNo(aut);
 			while(sid!=null){
-				Count=(Count+1)%100;			
+				Count=(Count+1)%100;
 				if(Count>=10){
-					aut=autNo+Count;	
+					aut=autNo+Count;
 				}else{
 					aut=autNo+"0"+Count;
 				}
-				sid=permissionMapper.selectIdByAutNo(aut);			
+				sid=permissionMapper.selectIdByAutNo(aut);
 			}
 			record.setAutNo(aut);
 		}
@@ -205,19 +207,19 @@ public class NewPermissionApiController extends BaseApiController {
 			String aut=autNo+Count;
 			String sid=permissionMapper.selectIdByAutNo(aut);
 			while(sid!=null){
-				Count=(Count+1)%100;				
+				Count=(Count+1)%100;
 				aut=autNo+Count;
-				sid=permissionMapper.selectIdByAutNo(aut);				
+				sid=permissionMapper.selectIdByAutNo(aut);
 			}
 			record.setAutNo(aut);
 		}
 		res.setData(permissionService.updateById(record,superName));
 		return res;
 	}
-	
+
 	/**
 	 * 查询导航
-	 * @param navId 导航	
+	 * @param navId 导航
 	 * @return
 	 */
 	@RequestMapping(value = "/selectNavList",method=RequestMethod.GET)
@@ -226,7 +228,7 @@ public class NewPermissionApiController extends BaseApiController {
 		res.setData(permissionService.selectNavList());
 		return res;
 	}
-	
+
 	/**
 	 * 查询菜单
 	 * @param navId

+ 0 - 2
src/main/java/com/goafanti/permission/service/impl/PermissionServiceImpl.java

@@ -231,9 +231,7 @@ public class PermissionServiceImpl extends BaseMybatisDao<PermissionMapper> impl
 	}
 
 	@Override
-	@Cacheable(value = "findPermissionsAll#500", key = "'all'")
 	public Map<String,Object> findPermissionsAll() {
-		System.out.println("===========================================findPermissionsAll#500");
 		Map<String,Object> params = new HashMap<String, Object>();
 		List<PermissionBo> one=permissionMapper.selectOneAll();
 		for (PermissionBo i:one){

+ 10 - 0
src/main/java/com/goafanti/weChat/bo/OutPublicDtails.java

@@ -45,6 +45,8 @@ public class OutPublicDtails  {
 	private String nextPlan;
 	@Excel(name = "审核信息" )
 	private String auditInfo;
+	@Excel(name = "审核时间" )
+	private String auditTimes;
 	private String annexUrl;
 	private String photoUrl;
 	@Excel(name = "修改标识",readConverterExp = "0=否,1=是",width = 8)
@@ -55,6 +57,14 @@ public class OutPublicDtails  {
 	private String assistantName;
 	private Integer assist;
 
+	public String getAuditTimes() {
+		return auditTimes;
+	}
+
+	public void setAuditTimes(String auditTimes) {
+		this.auditTimes = auditTimes;
+	}
+
 	public String getAssistantAid() {
 		return assistantAid;
 	}

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

@@ -280,6 +280,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		}
 		str=str.append(remarks);
 		p.setAuditInfo(str.toString());
+		p.setAuditTime(date);
 		p.setRejectName(ad.getName());
 		publicReleaseMapper.updateByPrimaryKeySelective(p);
 		addpublicLog(id, status, remarks);
@@ -628,10 +629,12 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			if(in.getDeps()!=null){
 				map.put("deps", departmentService.parseArray(in.getDeps()));
 			}
-		}else if(TokenManager.hasRole(AFTConstants.COMPANY_MANAGER)||TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)){
+		}else if(TokenManager.hasRole(AFTConstants.COMPANY_MANAGER)||TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)||TokenManager.hasRole(AFTConstants.OPERATION_MANAGER)){
 			in.setType(1);
 			if (in.getDeps()!=null){
-				map.put("deps", departmentService.selectSubDeps(in.getDeps()));
+				List<String> list = departmentService.selectSubDeps(in.getDeps());
+				if (list.isEmpty()) throw new BusinessException("无权查看此部门信息");
+				map.put("deps", list);
 			}else {
 				map.put("deps",departmentService.selectMyDeps());
 			}

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

@@ -46,7 +46,7 @@ user_remind_days=15
 user_channel_days=90
 
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.2.40
+static.host=//static.jishutao.com/1.2.42
 #avatar.host=//172.16.0.255:3000
 #static.host=//172.16.0.255:3000/1.2.27
 #static.host=http://172.16.1.187/prod/1.2.25

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

@@ -43,7 +43,7 @@ user_remind_days=15
 #\u63D0\u524D\u63D0\u9192\u5929\u6570
 user_channel_days=90
 
-static.host=//static.jishutao.com/1.2.40
+static.host=//static.jishutao.com/1.2.42
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 avatar.upload.host=//static.jishutao.com/upload