Browse Source

12.10优化开发

anderx 4 years ago
parent
commit
82b62fba95

+ 9 - 3
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

@@ -478,7 +478,7 @@
   	select y.aid,y.bh,y.dk,y.wsh,y.tg,y.duration,c.name from(select x.aid ,sum(x.bh)bh,sum(x.wsh)wsh,sum(x.tg)tg,sum(x.dk)dk,sum(x.duration)duration
 	from (select if(a.status=0,1,0)bh ,if(a.status=1,1,0)wsh,if(a.status=2,1,0)tg,if(a.clock_in=1,1,0) dk,a.aid
   	,if(a.status=2,a.duration,0)duration    from  public_release a  left join admin b on a.aid=b.id
-	where a.type=0
+	where 1=1
 	<if test="aid != null">
 	and a.aid= #{aid}
 	</if>
@@ -500,7 +500,7 @@
 
   <select id="countPublicStatistics" resultType="java.lang.Integer">
   	select count(*) from (select aid from public_release a  left join admin b on a.aid=b.id
-	where a.type=0
+	where 1=1
 	<if test="aid != null">
 	and a.aid= #{aid}
 	</if>
@@ -518,12 +518,15 @@
 
   <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,
+    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,
     a.plan ,a.next_plan nextPlan ,a.expected_effect expectedEffect
     from public_release a left join `user` b on a.uid=b.id left join admin c on a.aid =c.id
     left join admin d on b.aid=d.id where 1=1
+    <if test="publicType != null">
+      and a.type= #{publicType}
+    </if>
     <if test="aid != null">
       and a.aid= #{aid}
     </if>
@@ -562,6 +565,9 @@
 	from public_release a left join `user` b on a.uid=b.id left join admin c on a.aid =c.id
     left join admin d on b.aid=d.id
 	where 1=1
+    <if test="publicType != null">
+      and a.type= #{publicType}
+    </if>
     <if test="aid != null">
       and a.aid= #{aid}
     </if>

+ 14 - 11
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1100,7 +1100,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
 	from t_order_dun a
 	</if>
 	<if test="newStatus == 1 ">
-	a.project_type projectType,a.status dunStatus, a.dun_type dunType,a.appropriation_ratio appropriationRatio,
+	a.project_type projectType,a.status dunStatus, a.dun_type dunType,a.appropriation_ratio appropriationRatio,e.commodity_name commodityName,
 	e.set_up_amount setUpAmount,date_format(a.customize_time,'%Y-%m-%d') customizeTimes, a.customize_name customizeName
 	from new_order_dun a left join t_order_task e on a.tid=e.id
 	</if>
@@ -1388,15 +1388,18 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   </update>
 
   <select id="selectArrearsDunListByPage" resultType="com.goafanti.order.bo.OutArrearsDunListBo">
-select a.id, b.contract_no contractNo,a.order_no as orderNo,c.nickname as userName,tm.salesman_name as salesmanName,
-   	b.project_status projectStatus, b.total_amount as totalAmount,b.liquidation_status as liquidationStatus,a.`type`,
-   	b.settlement_amount as settlementAmount, a.order_receivables orderReceivables,a.order_arrears as orderArrears,
-   	b.order_status as orderStatus, date_format(a.start_time, '%Y-%m-%d %H:%i:%s') as startDate,dep.name as depName,
-   	date_format(b.sign_time,'%Y-%m-%d') as signDate,a.dun_status dunStatus  from t_arrears_dun a
-   	left join t_order_new b on a.order_no=b.order_no left join `user` c on b.buyer_id=c.id
-	left join t_order_mid tm on b.order_no=tm.order_no left join department dep on b.order_dep=dep.id
-	where  b.delete_sign != 1 and dun_status in (1,2,3)
-	<if test="shiroType == 1 and fid !=null">
+    select a.id, b.contract_no contractNo,a.order_no as orderNo,c.nickname as userName,tm.salesman_name as salesmanName,
+    b.project_status projectStatus, b.total_amount as totalAmount,b.liquidation_status as liquidationStatus,a.`type`,
+    b.settlement_amount as settlementAmount, a.order_receivables orderReceivables,a.order_arrears as orderArrears,
+    b.order_status as orderStatus, date_format(a.start_time, '%Y-%m-%d %H:%i:%s') as startDate,dep.name as depName,
+    date_format(b.sign_time,'%Y-%m-%d') as signDate,a.dun_status dunStatus ,x.commodity_name commodityName,
+    date_format(tla.create_time , '%Y-%m-%d %H:%i:%s')legalTimes  from t_arrears_dun a
+    left join t_order_new b on a.order_no=b.order_no left join `user` c on b.buyer_id=c.id
+    left join t_order_mid tm on b.order_no=tm.order_no left join department dep on b.order_dep=dep.id
+    left join (select order_no ,create_time from t_order_legal_affairs where type in(3,4)) tla on b.order_no =tla.order_no
+    left join (select order_no ,commodity_name from t_order_task where main =1 and split_status in(0,1))x on b.order_no =x.order_no
+    where  b.delete_sign in(0,2) and dun_status in (1,2,3)
+    <if test="shiroType == 1 and fid !=null">
   	 and tm.finance_id= #{fid,jdbcType=VARCHAR}
   	</if>
   	<if test="shiroType == 2 and fid !=null">
@@ -1435,7 +1438,7 @@ select a.id, b.contract_no contractNo,a.order_no as orderNo,c.nickname as userNa
   select count(*) from t_arrears_dun a
    	left join t_order_new b on a.order_no=b.order_no left join `user` c on b.buyer_id=c.id
 	left join t_order_mid tm on b.order_no=tm.order_no left join department dep on b.order_dep=dep.id
-	where  b.delete_sign != 1 and dun_status in (1,2,3)
+    where  b.delete_sign in(0,2) and dun_status in (1,2,3)
 	<if test="shiroType == 1 and fid !=null">
   	 and tm.finance_id= #{fid,jdbcType=VARCHAR}
   	</if>

+ 0 - 2
src/main/java/com/goafanti/common/task/PatentTask.java

@@ -83,7 +83,6 @@ public class PatentTask {
 				Integer status=0;
 				// 计算相差日期
 				int count = patentNewService.countDays(p.getEndDate());
-				
 				boolean flag=false;
 				if (count > 60 && count <= 90&&p.getStatus()!=1) {
 					flag=true;
@@ -224,7 +223,6 @@ public class PatentTask {
 
 	/**
 	 * 修改专利状态
-	 * @param s1
 	 * @param status
 	 * @throws InterruptedException 
 	 */

+ 24 - 5
src/main/java/com/goafanti/order/bo/OutArrearsDunListBo.java

@@ -7,7 +7,7 @@ import com.goafanti.order.enums.NewProjectStatus;
 
 
 public class OutArrearsDunListBo {
-	private String id;
+	private Integer id;
 	@Excel(name = "合同编号")
 	private String contractNo;
 	@Excel(name = "订单编号")
@@ -21,6 +21,8 @@ public class OutArrearsDunListBo {
 	@Excel(name = "订单状态",readConverterExp = "0=待签单,1=签单待审,2=签单审核通过,3=签单审核拒绝,4=已结项,5=已驳回,6=退单中,7=已退单")
    	private Integer orderStatus;
 	private Integer projectStatus;
+	@Excel(name = "项目名称")
+	private String commodityName;
 	@Excel(name = "项目状态")
 	private String projectStatusName;
 	@Excel(name = "签单金额(万元)")
@@ -41,12 +43,29 @@ public class OutArrearsDunListBo {
 	private String startDate;
 	@Excel(name = "下单时间")
 	private String signDate;
-	
-   	
-	public String getId() {
+	@Excel(name = "法务时间")
+	private String legalTimes;
+
+	public String getCommodityName() {
+		return commodityName;
+	}
+
+	public void setCommodityName(String commodityName) {
+		this.commodityName = commodityName;
+	}
+
+	public String getLegalTimes() {
+		return legalTimes;
+	}
+
+	public void setLegalTimes(String legalTimes) {
+		this.legalTimes = legalTimes;
+	}
+
+	public Integer getId() {
 		return id;
 	}
-	public void setId(String id) {
+	public void setId(Integer id) {
 		this.id = id;
 	}
 	public String getContractNo() {

+ 10 - 0
src/main/java/com/goafanti/order/bo/outOrderDunListBo.java

@@ -11,6 +11,7 @@ public class outOrderDunListBo {
 	private String orderNo;
 	private String userName;
 	private String salesmanName;
+	private String commodityName;
 	private Integer projectStatus;
 	private BigDecimal totalAmount;
 	private Integer liquidationStatus;
@@ -41,6 +42,15 @@ public class outOrderDunListBo {
 		if(getDunType()!=null&&getDunType()==0&&getProjectType()!=null)return NewOrderDunType.getValueByCode(Integer.valueOf(""+getProjectType()+getDunType()))+getCustomizeName();
 		return dunSubject;
 	}
+
+	public String getCommodityName() {
+		return commodityName;
+	}
+
+	public void setCommodityName(String commodityName) {
+		this.commodityName = commodityName;
+	}
+
 	public void setId(String id) {
 		this.id = id;
 	}

+ 5 - 1
src/main/java/com/goafanti/patent/service/impl/PatentNewServiceImpl.java

@@ -12,6 +12,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
+import com.mysql.jdbc.log.Log;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.ss.usermodel.Row;
@@ -73,7 +74,10 @@ public class PatentNewServiceImpl  extends BaseMybatisDao<PatentNewMapper> imple
 	@Autowired
 	private AdminMapper	adminMapper;
 	
-	private List<PatentYearPayment> patentYear=new ArrayList<PatentYearPayment>(); 
+	private List<PatentYearPayment> patentYear=new ArrayList<PatentYearPayment>();
+
+
+
 
 	@Value(value = "${upload.path}")
 	private String uploadPath=null;

+ 12 - 0
src/main/java/com/goafanti/weChat/bo/InputPublicDtails.java

@@ -14,9 +14,21 @@ public class InputPublicDtails {
 	private Integer type;
 	private String sid;
 	private String depId;
+	/**
+	 * 0业务/行政 1技术
+	 */
+	private Integer publicType;
 	private Integer pageSize;
 	private Integer pageNo;
 
+	public Integer getPublicType() {
+		return publicType;
+	}
+
+	public void setPublicType(Integer publicType) {
+		this.publicType = publicType;
+	}
+
 	public String getSid() {
 		return sid;
 	}

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

@@ -27,6 +27,8 @@ public class OutPublicDtails {
 	private String clockInTimes;
 	@Excel(name = "创建时间" )
 	private String createTimes;
+	@Excel(name = "公出类型",readConverterExp = "0=业务/行政,1=技术")
+	private Integer type;
 	@Excel(name = "公出目标" )
 	private String remarks;
 	@Excel(name = "公出计划" )
@@ -42,6 +44,14 @@ public class OutPublicDtails {
 	private String annexUrl;
 	private String photoUrl;
 
+	public Integer getType() {
+		return type;
+	}
+
+	public void setType(Integer type) {
+		this.type = type;
+	}
+
 	public String getPlan() {
 		return plan;
 	}

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

@@ -351,6 +351,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		if(in.getUid()!=null) map.put("uid", in.getUid());
 		if(in.getStatus()!=null) map.put("status", in.getStatus());
 		if(in.getClockIn()!=null) map.put("clockIn", in.getClockIn());
+		if(in.getPublicType()!=null)map.put("publicType",in.getPublicType());
 		if(TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)
 				||TokenManager.hasRole(AFTConstants.CED_ASSISTANT)){
 			in.setType(2);}

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

@@ -50,7 +50,7 @@ avatar.upload.host=//sb.jishutao.com/upload
 #avatar.host=//172.16.0.253
 
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.2.02
+static.host=//static.jishutao.com/1.2.03
 
 wx.appId=wxff2f5720ed7d7f63
 wx.appSecret=081744369d42405be58fe37f892631f7