anderx 3 years ago
parent
commit
e04d48994a

+ 1 - 1
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -1550,7 +1550,7 @@
       ttm.reject_count	rejectCount ,ttm.cost_amount costAmount ,(a.commodity_price-ttm.cost_amount)profit,
     </if>
 
-    a.commodity_quantity commodityQuantity , a.commodity_price commodityPrice ,a.special_comment specialComment
+    a.commodity_quantity commodityQuantity , a.commodity_price commodityPrice ,a.special_comment specialComment,a.task_comment taskComment
     from t_order_task a left join t_order_new b on a.order_no =b.order_no left join department c on b.order_dep =c.id left join district_glossory d on c.province=d.id
     <if test="status==3 or status==4">
       left join task_progress tp  on a.id=tp.task_id

+ 19 - 19
src/main/java/com/goafanti/order/service/impl/ProjectStatisticsServiceImpl.java

@@ -76,8 +76,8 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
 			params.put("amountEnd", e);
 		}
 		params.put("status",ps.getStatus()==null?0:ps.getStatus());
-		
-		
+
+
 		if(ps.getProvince()!=null)	params.put("province", ps.getProvince());
 		if(ps.getProjectId()!=null) params.put("projectId", ps.getProjectId());
 		if(ps.getScreen()!=null) params.put("screen", ps.getScreen());
@@ -113,7 +113,7 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
 				String[] ss= {"软著数量/已下证","有无材料","加急天数","下证时间","证书编号","成本","利润"};
 				Collections.addAll(ls, ss);
 			}else if (ib.getStatus()==4) {
-				//专利	
+				//专利
 				String[] ss= {"是否高新","项目数量/下证数","驳回数","专利号","专利名称","受理时间","下证时间","成本","利润"};
 				Collections.addAll(ls, ss);
 			}
@@ -150,16 +150,16 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
     				case "负责部门": o = ob.getTechDepName(); break;
     				case "咨询师/咨询经理": o = ob.getTechName(); break;
     				case "项目状态": o = NewProjectStatus.getValueByCode(ob.getProjectStatus()); break;
-    				
+
     				//是否立项 立项时间 是否抽查 联系人电话 法人电话 证书编号 申报批次
     				case "是否立项": o = ob.getSetUpStatus()==null?"":ob.getSetUpStatus()==1?"是":"否"; break;
     				case "立项时间": o = ob.getSetUpTime(); break;
-    				case "是否抽查": 
+    				case "是否抽查":
     					//是否抽查 0否 1未通过 2通过
     					if (ob.getSpotCheckStatus()==null) o="";
-    					if (ob.getSpotCheckStatus()==0) o="否";
-    					if (ob.getSpotCheckStatus()==1) o="未通过";
-    					if (ob.getSpotCheckStatus()==2) o="通过";
+    					else if (ob.getSpotCheckStatus()==0) o="否";
+						else if (ob.getSpotCheckStatus()==1) o="未通过";
+						else if (ob.getSpotCheckStatus()==2) o="通过";
     					break;
     				case "联系人电话": o = ob.getContactMobile(); break;
     				case "法人电话": o = ob.getLegalPersonTel(); break;
@@ -180,7 +180,7 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
     				case "专利号": o = ob.getPatentNo(); break;
     				case "专利名称": o = ob.getPatentName(); break;
     				case "受理时间": o = ob.getAcceptTime(); break;
-    				
+
     				case "签单金额": o = ob.getCommodityPrice().stripTrailingZeros().toPlainString(); break;
     				case "特别说明": o = ob.getSpecialComment(); break;
     				default: o = ""; break;
@@ -190,22 +190,22 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
     			}
     		}
     		//返回名称及参数
-			 response.addHeader("Content-Disposition", "attachment;filename="  + new String(fileName.getBytes(),"iso-8859-1"));  
+			 response.addHeader("Content-Disposition", "attachment;filename="  + new String(fileName.getBytes(),"iso-8859-1"));
 			 response.setContentType("application/octet-stream;charset=utf-8");
     		 // 返回数据流
-			 wb.write(out); 
+			 wb.write(out);
 			 out.flush();
 			 out.close();
 		} catch (Exception e) {
 			e.printStackTrace();
 			throw new BusinessException(new Error("表格生成错误。"));
 		}finally {
-			out.flush(); 
-			 out.close(); 
+			out.flush();
+			 out.close();
 		}
-	} 
+	}
+
 
-	
 	private String getInputString(InputProjectStatistics ib) {
 		String str="搜索条件:";
 		int i=1;
@@ -250,7 +250,7 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
 		}
 		if(i==1)str=StringUtils.join(str,"无");
 		return str;
-		
+
 	}
 
 	@SuppressWarnings("unchecked")
@@ -297,7 +297,7 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
 				ls.add("完结数");
 				ls.add("授权数");
 				ls.add("驳回数");
-				
+
 			}else if (ib.getStatus()==4) {
 				//软著
 				ls.add("下证数");
@@ -351,7 +351,7 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
     				case "申请数": o = ob.getApplyCount().toString(); break;
     				//"完成数","公示/立项数"
     				case "公示数": o = ob.getPublicityCount().toString(); break;
-    				
+
     				case "签单额(万元)": o = ob.getAmountCount().stripTrailingZeros().toPlainString(); break;
     				case "成本(万元)": o = ob.getCostAmount().stripTrailingZeros().toPlainString(); break;
     				case "利润(万元)": o = ob.getProfit().stripTrailingZeros().toPlainString(); break;
@@ -369,7 +369,7 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
 			}
 			out=new FileOutputStream(downloadPath);
     		// 返回数据流
-			 wb.write(out); 
+			 wb.write(out);
 			return new Result().data(filename);
 		} catch (Exception e) {
 			e.printStackTrace();

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

@@ -1,12 +1,12 @@
 dev.name=local
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-#jdbc.url=jdbc\:mysql://localhost:3306/aft20220225?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-#jdbc.username=root
-#jdbc.password=123456
-jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.url=jdbc\:mysql://localhost:3306/aft20220318?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 jdbc.username=root
-jdbc.password=aftdev
+jdbc.password=123456
+#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.username=root
+#jdbc.password=aftdev
 jdbc.validationQuery=SELECT 'x'
 jdbc.initialSize=3
 jdbc.maxActive=20
@@ -51,10 +51,10 @@ 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.04
+static.host=//static.jishutao.com/1.2.05
 avatar.host=//172.16.0.255:3000
-#static.host=//172.16.0.255:3000/1.2.04
-#static.host=http://172.16.1.187/prod/1.2.04
+#static.host=//172.16.0.255:3000/1.2.05
+#static.host=http://172.16.1.187/prod/1.2.05
 
 wx.appId=wxff2f5720ed7d7f63
 wx.appSecret=081744369d42405be58fe37f892631f7