Browse Source

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

anderx 11 months ago
parent
commit
3f5c984261

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

@@ -2141,13 +2141,14 @@ progress_tid = values(progress_tid)
         f.nickname as userName,h.name as depName, j.name as outsourceName ,ifnull(k.hours,0) hours,a.split_status splitStatus,a.split_super splitSuper,a.member_type memberType,
         date_format(a.split_time,'%Y-%m-%d %H:%i:%S') splitTimes,ad.name splitAname,a.split_id splitId,a.patent_type  patentType,a.picture_url pictureUrl,
         ttm.service_life serviceLife,ttm.service_year serviceYear ,ttm.year_sum yearSum ,ttm.contract_term contractTerm,a.process_status processStatus,
-        a.score_status scoreStatus,a.score_number scoreNumber
+        a.score_status scoreStatus,a.score_number scoreNumber,td.project_name projectMemberName
         from t_order_task a left join business_project b on a.commodity_id=b.id left join business_category c on b.cid=c.id
         left join admin d on a.task_receiver=d.id left join t_order_new e on a.order_no=e.order_no left join user f on e.buyer_id=f.id
         left join department h on e.order_dep=h.id left join (select task_id , sum(already_number) as alreadyNumber
         from task_progress group by task_id) i on a.id=i.task_id  left join (select order_no,max(name)as name
         from outsource_organization group by order_no) j on a.order_no=j.order_no left join task_hours_count k on a.id=k.tid and a.task_receiver=k.aid
         left join t_order_outsource l on a.id=l.tid left join admin ad on ad.id=a.split_aid left join t_task_member ttm on a.id=ttm.tid
+        left join task_details td on a.progress_tid=td.id
         where  e.order_status  in (0,1,2,3,4,5)
         and split_status =2 and a.split_super= #{tid}
         <if test="type == 1">

+ 2 - 2
src/main/java/com/goafanti/common/mapper/TaskDetailsMapper.xml

@@ -1324,8 +1324,8 @@ feature_other = values(feature_other)
             <if test="outSourcingStatus !=null">
                 and b.outsource= #{outSourcingStatus}
             </if>
-            <if test="updateTime !=null">
-                and a.update_time between #{updateTime} and #{updateTime} + interval 1 day
+            <if test="updateStartTime !=null and updateEndTime !=null">
+                and a.update_time between #{updateStartTime} and #{updateEndTime}
             </if>
             <if test="progress !=null">
                 and a.progress = #{progress}

+ 78 - 76
src/main/java/com/goafanti/common/utils/excel/NewExcelUtil.java

@@ -1975,7 +1975,7 @@ public class NewExcelUtil<T> {
 	}
 
 	private void addCell(Row row,TaskDetailsBo o,Integer index) {
-		for (int i = 0; i < 85; i++) {
+		for (int i = 0; i < 87; i++) {
 			Cell cell = row.createCell(i);
 			cell.setCellStyle(styles.get("data4"));
 			if (i==0)cell.setCellValue(index);//序号
@@ -2000,43 +2000,45 @@ public class NewExcelUtil<T> {
 			else if(i==7)cell.setCellValue(addThis(o.getProjectName()));		//项目负责人
 			else if(i==8)cell.setCellValue(addThis(o.getTechnologyName()));		//技术咨询师
 			else if(i==9)cell.setCellValue(addThis(o.getFinanceTaxationName()));	//财税咨询师
-			else if(i==10)cell.setCellValue(getBigDecimal(o.getBeforeLastRdSalesAmount()));  //上上年度销售收入
-			else if(i==11)cell.setCellValue(getBigDecimal(o.getBeforeLastRdBudget()));  //上上年度研发费用
-			else if(i==12)cell.setCellValue(getBigDecimal(o.getLastRdSalesAmount())); //上年度销售收入
-			else if(i==13)cell.setCellValue(getBigDecimal(o.getRdSalesAmount())); //上年度研发费用
-			else if(i==14){
+			else if(i==10)cell.setCellValue(addThis(o.getBeforeLastYear()));
+			else if(i==11)cell.setCellValue(getBigDecimal(o.getBeforeLastRdSalesAmount()));  //上上年度销售收入
+			else if(i==12)cell.setCellValue(getBigDecimal(o.getBeforeLastRdBudget()));  //上上年度研发费用
+			else if(i==13)cell.setCellValue(addThis(o.getLastYear()));
+			else if(i==14)cell.setCellValue(getBigDecimal(o.getLastRdSalesAmount())); //上年度销售收入
+			else if(i==15)cell.setCellValue(getBigDecimal(o.getRdSalesAmount())); //上年度研发费用
+			else if(i==16){
 				if (o.getWorkersNumber()==null){
 					cell.setCellValue("");
 				}else {
 					cell.setCellValue(o.getWorkersNumber());
 				}
 			}
-			else if(i==15)cell.setCellValue(addThis(o.getTechnologyNumber()));//科技人员
-			else if(i==16){
+			else if(i==17)cell.setCellValue(addThis(o.getTechnologyNumber()));//科技人员
+			else if(i==18){
 				if (o.getWorkersRate()==null){
 					cell.setCellValue("");
 				}else {
 					cell.setCellValue(o.getWorkersRate()+"%");//人员占比
 				}
 			}
-			else if(i==17)cell.setCellValue(addThis(o.getProjectApprovalNumber()));//研发立项数
-			else if(i==18)cell.setCellValue(getBigDecimal(o.getRdBudget()));//年度研发预算总额
-			else if(i==19)cell.setCellValue(getBigDecimal(o.getRdSalesAmount()));//年度销售预计收入
-			else if(i==20){
+			else if(i==19)cell.setCellValue(addThis(o.getProjectApprovalNumber()));//研发立项数
+			else if(i==20)cell.setCellValue(getBigDecimal(o.getRdBudget()));//年度研发预算总额
+			else if(i==21)cell.setCellValue(getBigDecimal(o.getRdSalesAmount()));//年度销售预计收入
+			else if(i==22){
 				if (o.getRdBudgetRate()==null){
 					cell.setCellValue("");
 				}else {
 					cell.setCellValue(o.getRdBudgetRate()+"%");//年度研发费用预算占比
 				}
 			}
-			else if(i==21){
+			else if(i==23){
 				if (o.getThreeYearsActualRdRate()==null){
 					cell.setCellValue("");
 				}else {
 					cell.setCellValue(o.getThreeYearsActualRdRate()+"%");//三年度研发费用占比
 				}
 			}
-			else if(i==22){//数据周期
+			else if(i==24){//数据周期
 				if (o.getDataCycle()==null){
 					cell.setCellValue("");
 				}else {
@@ -2051,81 +2053,81 @@ public class NewExcelUtil<T> {
 
 					}
 				}
-			}else if(i==23){//已立项RD数
+			}else if(i==25){//已立项RD数
 				cell.setCellValue(addThis(o.getActualRdNumber()));
-			}else if(i==24){//委外项目数
+			}else if(i==26){//委外项目数
 				cell.setCellValue(addThis(o.getActualOutsourcingNumber()));
 			}
-			else if(i==25){//合作项目数
+			else if(i==27){//合作项目数
 				cell.setCellValue(addThis(o.getActualCooperateNumber()));
 			}
-			else if(i==26){//已归集研发费用总额
+			else if(i==28){//已归集研发费用总额
 				cell.setCellValue(getBigDecimal(o.getActualRdAmount()));
 			}
-			else if(i==27){//研发预算完成度
+			else if(i==29){//研发预算完成度
 				if(o.getRdCompletionProgress()==null){
 					cell.setCellValue("");
 				}else{
 					cell.setCellValue(o.getRdCompletionProgress()+"%");
 				}
 			}
-			else if(i==28){//年度实际销售额
+			else if(i==30){//年度实际销售额
 				cell.setCellValue(getBigDecimal(o.getActualSalesAmount()));
 			}
-			else if(i==29){//年度研发费用占比
+			else if(i==31){//年度研发费用占比
 				if (o.getActualRdRate()==null){
 					cell.setCellValue("");
 				}else {
 					cell.setCellValue(o.getActualRdRate()+"%");
 				}
 			}
-			else if(i==30){//三年研发费用占比
+			else if(i==32){//三年研发费用占比
 				if (o.getThreeYearsActualRdRate()==null){
 					cell.setCellValue("");
 				}else {
 					cell.setCellValue(o.getThreeYearsActualRdRate()+"%");
 				}
 			}
-			else if(i==31){//火炬统计
+			else if(i==33){//火炬统计
 				addParam(cell,o.getTorchStatus(),o.getTorchOther());
 			}
-			else if(i==32){//统计年报
+			else if(i==34){//统计年报
 				addParam(cell,o.getStatisticsStatus(),o.getStatisticsOther());
 			}
-			else if(i==33){//高企年报
+			else if(i==35){//高企年报
 				addParam(cell,o.getChStatus(),o.getChOther());
 			}
-			else if(i==34){//汇算清缴-是否完成
+			else if(i==36){//汇算清缴-是否完成
 				addParam(cell,o.getFinalSettlementStatus(),o.getFinalSettlementOther());
 			}
-			else if(i==35){//汇算清缴-加扣RD数
+			else if(i==37){//汇算清缴-加扣RD数
 				cell.setCellValue(addThis(o.getReportFormsRdNumber()));
 			}
-			else if(i==36){//汇算清缴-知识产权加扣费用
+			else if(i==38){//汇算清缴-知识产权加扣费用
 				cell.setCellValue(getBigDecimal(o.getIntellectualPropertyAmount()));
 			}
-			else if(i==37){//汇算清缴-加扣研发费用金额
+			else if(i==39){//汇算清缴-加扣研发费用金额
 				cell.setCellValue(getBigDecimal(o.getReportRdAmount()));
 			}
-			else if(i==38){//研发准备金备案
+			else if(i==40){//研发准备金备案
 				addParam(cell,o.getRdReservesStatus(),o.getRdReservesOther());
 			}
-			else if(i==39){//研发奖补申请-是否完成
+			else if(i==41){//研发奖补申请-是否完成
 				addParam(cell,o.getRdAwardCompensationStatus(),o.getRdAwardCompensationOther());
 			}
-			else if(i==40){//研发奖补申请-申请金额
+			else if(i==42){//研发奖补申请-申请金额
 				cell.setCellValue(getBigDecimal(o.getRdApplicationFee()));
 			}
-			else if(i==41){//研发奖补申请-公示金额
+			else if(i==43){//研发奖补申请-公示金额
 				cell.setCellValue(getBigDecimal(o.getRdAnnouncementAmount()));
 			}
-			else if(i==42){//研发奖补申请-其他
+			else if(i==44){//研发奖补申请-其他
 				cell.setCellValue(addThis(o.getRdAnnouncementOther()));
 			}
-			else if(i==43){//加扣备查交付
+			else if(i==45){//加扣备查交付
 				addParam(cell,o.getAdDeliverStatus(),o.getAdDeliverOther());
 			}
-			else if(i==44){//加扣是否归档
+			else if(i==46){//加扣是否归档
 				if(o.getAdDeliverFinish()==null){
 					cell.setCellValue("");
 				}else if(o.getAdDeliverFinish()==1){
@@ -2134,10 +2136,10 @@ public class NewExcelUtil<T> {
 					cell.setCellValue("否");
 				}
 			}
-			else if(i==45){//高新备查交付
+			else if(i==47){//高新备查交付
 				addParam(cell,o.getHtDeliverStatus(),o.getHtDeliverOther());
 			}
-			else if(i==46){//高新是否归档
+			else if(i==48){//高新是否归档
 				if (o.getHtDeliverFinish()==null){
 					cell.setCellValue("");
 				}else if(o.getHtDeliverFinish()==1){
@@ -2146,10 +2148,10 @@ public class NewExcelUtil<T> {
 					cell.setCellValue("否");
 				}
 			}
-			else if(i==47){//召开上年度会议于本年度工作计划
+			else if(i==49){//召开上年度会议于本年度工作计划
 				addParam(cell,o.getCloseMeetingStatus(),o.getCloseMeetingOther());
 			}
-			else if(i==48){//阶段性汇报
+			else if(i==50){//阶段性汇报
 				if(o.getPhasedType()==null){
 					cell.setCellValue("");
 				}else {
@@ -2170,82 +2172,82 @@ public class NewExcelUtil<T> {
 					}
 				}
 			}
-			else if(i==49){//立项资料编制-完成数
+			else if(i==51){//立项资料编制-完成数
 				cell.setCellValue(addThis(o.getProjectApprovalWriteNumber()));
-			}else if(i==50){//立项资料编制-完成率
+			}else if(i==52){//立项资料编制-完成率
 				if(o.getProjectApprovalWriteRate()==null){
 					cell.setCellValue("");
 				}else {
 					cell.setCellValue(o.getProjectApprovalWriteRate()+"%");
 				}
 
-			}else if(i==51){//加扣预计申报7月
+			}else if(i==53){//加扣预计申报7月
 				addParam(cell,o.getAdPrepareJulyStatus(),o.getAdPrepareJulyOther());
-			}else if(i==52){//加扣预计申报10月
+			}else if(i==54){//加扣预计申报10月
 				addParam(cell,o.getAdPrepareOctoberStatus(),o.getAdPrepareOctoberOther());
-			}else if(i==53){//知识产权-发明专利-申报数
+			}else if(i==55){//知识产权-发明专利-申报数
 				cell.setCellValue(addThis(o.getIpInventionPatentDeclare()));
-			}else if(i==54){//知识产权-发明专利-授权数
+			}else if(i==56){//知识产权-发明专利-授权数
 				cell.setCellValue(addThis(o.getIpInventionPatentAuthorize()));
-			}else if(i==55){///知识产权-发明专利-累计授权数
+			}else if(i==57){///知识产权-发明专利-累计授权数
 				cell.setCellValue(addThis(o.getIpInventionPatentAuthorizeCount()));
-			}else if(i==56){//实用新型-申报数
+			}else if(i==58){//实用新型-申报数
 				cell.setCellValue(addThis(o.getIpUtilityModelDeclare()));
-			}else if(i==57){//实用新型-授权数
+			}else if(i==59){//实用新型-授权数
 				cell.setCellValue(addThis(o.getIpUtilityModelAuthorize()));
-			}else if(i==58){//实用新型-累计授权数
+			}else if(i==60){//实用新型-累计授权数
 				cell.setCellValue(addThis(o.getIpUtilityModelAuthorizeCount()));
-			}else if(i==59){//软著-申报数
+			}else if(i==61){//软著-申报数
 				cell.setCellValue(addThis(o.getIpSoftwareWorksDeclare()));
-			}else if(i==60){//软著-授权数
+			}else if(i==62){//软著-授权数
 				cell.setCellValue(addThis(o.getIpSoftwareWorksAuthorize()));
-			}else if(i==61){//软著-累计授权数
+			}else if(i==63){//软著-累计授权数
 				cell.setCellValue(addThis(o.getIpSoftwareWorksAuthorizeCount()));
-			}else if(i==62){//软著-截止本年末可用于下次高新认定数量
+			}else if(i==64){//软著-截止本年末可用于下次高新认定数量
 				cell.setCellValue(addThis(o.getIpHt()));
-			}else if(i==63){//软著-I类数量
+			}else if(i==65){//软著-I类数量
 				cell.setCellValue(addThis(o.getIpHtI()));
-			}else if(i==64){//软著-II类数量
+			}else if(i==66){//软著-II类数量
 				cell.setCellValue(addThis(o.getIpHtIi()));
-			}else if(i==65){//公出指标-合同约定次数
+			}else if(i==67){//公出指标-合同约定次数
 				cell.setCellValue(addThis(o.getPublicReleaseStipulation()));
-			}else if(i==66){//公出指标-实际次数
+			}else if(i==68){//公出指标-实际次数
 				cell.setCellValue(addThis(o.getPublicReleaseActual()));
-			}else if(i==67){//培训指标(本年度)-合同约定次数
+			}else if(i==69){//培训指标(本年度)-合同约定次数
 				cell.setCellValue(addThis(o.getTrainingStipulation()));
-			}else if(i==68){//培训指标(本年度)-实际次数
+			}else if(i==70){//培训指标(本年度)-实际次数
 				cell.setCellValue(addThis(o.getTrainingActual()));
-			}else if(i==69){//培训指标(本年度)-其他
+			}else if(i==71){//培训指标(本年度)-其他
 				cell.setCellValue(addThis(o.getTrainingOther()));
-			}else if(i==70){//特色工作-高新技术税收优惠政策检查
+			}else if(i==72){//特色工作-高新技术税收优惠政策检查
 				cell.setCellValue(addThis(o.getFeatureHt()));
-			}else if(i==71){//特色工作-加计扣除税收优惠政策检查
+			}else if(i==73){//特色工作-加计扣除税收优惠政策检查
 				cell.setCellValue(addThis(o.getFeatureAd()));
-			}else if(i==72){//特色工作-税务常规检查
+			}else if(i==74){//特色工作-税务常规检查
 				cell.setCellValue(addThis(o.getFeatureTr()));
-			}else if(i==73){//特色工作-税务对研发费用检查
+			}else if(i==75){//特色工作-税务对研发费用检查
 				cell.setCellValue(addThis(o.getFeatureTe()));
-			}else if(i==74){//特色工作-税务稽查
+			}else if(i==76){//特色工作-税务稽查
 				cell.setCellValue(addThis(o.getFeatureTi()));
-			}else if(i==75){//特色工作-其他
+			}else if(i==77){//特色工作-其他
 				cell.setCellValue(addThis(o.getFeatureOther()));
-			}else if(i==76){//其他事项说明
+			}else if(i==78){//其他事项说明
 				cell.setCellValue(addThis(o.getRemarks()));
-			}else if(i==77){//创新能力评价评分
+			}else if(i==79){//创新能力评价评分
 				cell.setCellValue(addThis(o.getHtScore()));
-			}else if(i==78){//实际申报批次
+			}else if(i==80){//实际申报批次
 				cell.setCellValue(addThis(o.getHtBatch()));
-			}else if(i==79){//是否重点关注
+			}else if(i==81){//是否重点关注
 				if(o.getHtFocus()==null){
 					cell.setCellValue("");
 				}else {
 					cell.setCellValue(o.getHtFocus()==1?"是":"否");
 				}
-			}else if(i==80){//网上系统提交
+			}else if(i==82){//网上系统提交
 				addParam(cell,o.getWebSubmit(),o.getWebSubmitOther());
-			}else if(i==81){//纸质材料提交
+			}else if(i==83){//纸质材料提交
 				addParam(cell,o.getPaperSubmit(),o.getPaperSubmitOther());
-			}else if(i==82){//省级-拟公示序号
+			}else if(i==84){//省级-拟公示序号
 				if(o.getReviewProvince()==null){
 					cell.setCellValue("");
 				}else {
@@ -2255,7 +2257,7 @@ public class NewExcelUtil<T> {
 						cell.setCellValue("公示,序号:"+o.getReviewProvinceNumber());
 					}
 				}
-			}else if(i==83){//国家级-高企编号
+			}else if(i==85){//国家级-高企编号
 				if(o.getReviewCountry()==null){
 					cell.setCellValue("");
 				}else {
@@ -2265,7 +2267,7 @@ public class NewExcelUtil<T> {
 						cell.setCellValue("公示,编号:"+o.getReviewCountryNumber());
 					}
 				}
-			}else if(i==84){//更新时间
+			}else if(i==86){//更新时间
 				if(o.getUpdateTime()==null){
 					cell.setCellValue("");
 				}else {

+ 11 - 0
src/main/java/com/goafanti/order/bo/TOrderTaskListBo.java

@@ -105,7 +105,18 @@ public class TOrderTaskListBo {
 	private Integer  scoreNumber;
 
 	private String receiverMobile;
+	/**
+	 * 项目负责人
+	 */
+	private String projectMemberName;
 
+	public String getProjectMemberName() {
+		return projectMemberName;
+	}
+
+	public void setProjectMemberName(String projectMemberName) {
+		this.projectMemberName = projectMemberName;
+	}
 
 	public Integer getScoreStatus() {
 		return scoreStatus;

+ 18 - 6
src/main/java/com/goafanti/techproject/bo/InputTaskDetailsBo.java

@@ -29,9 +29,13 @@ public class InputTaskDetailsBo {
      */
     private String outSourcingStatus;
     /**
-     *更新时间
+     *更新开始时间
      */
-    private String updateTime;
+    private String updateStartTime;
+    /**
+     *更新结束时间
+     */
+    private String updateEndTime;
     /**
      *进度
      */
@@ -128,12 +132,20 @@ public class InputTaskDetailsBo {
         this.outSourcingStatus = outSourcingStatus;
     }
 
-    public String getUpdateTime() {
-        return updateTime;
+    public String getUpdateStartTime() {
+        return updateStartTime;
+    }
+
+    public void setUpdateStartTime(String updateStartTime) {
+        this.updateStartTime = updateStartTime;
+    }
+
+    public String getUpdateEndTime() {
+        return updateEndTime;
     }
 
-    public void setUpdateTime(String updateTime) {
-        this.updateTime = updateTime;
+    public void setUpdateEndTime(String updateEndTime) {
+        this.updateEndTime = updateEndTime;
     }
 
     public String getProgress() {

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

@@ -98,7 +98,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
 
     @Override
     public Pagination<TaskDetailsBo> pushDetailsList(InputTaskDetailsBo in) {
-
+        if (StringUtils.isNotBlank(in.getUpdateEndTime()))in.setUpdateEndTime(in.getUpdateEndTime()+" 23:59:59");
         // 0=查询所有,1=查询自己,2=查询下级,3=负责人查询
         if (TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)){
             in.setRoleStatus(0);

+ 32 - 18
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -274,31 +274,45 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			AtomicReference<Integer> status= new AtomicReference<>(1);
 			String formatDate = DateUtils.formatDate(in.getCreateTime(), AFTConstants.YYYYMMDDHHMMSS);
 			//业务公出
-			if (in.getType()==0){
+			if (in.getType()==0||in.getType()==2){
 				//不是业务员
 				if (my.getPublicPurview()==0){
                     for (User u : users) {
 						//不是自己的客户
-                        if (!u.getAid().equals(my.getId())) {
-							List<RestrictProject> list = restrictProjectMapper.selectListByParam(new InputRestrictProject(u.getId(), my.getId()));
+						if (!u.getAid().equals(my.getId())) {
 							StringBuilder str2 = new StringBuilder();
 							Admin admin = adminMapper.queryById(u.getAid());
-							if (!list.isEmpty()){
-								String start = DateUtils.formatDate(in.getReleaseStart(), AFTConstants.MMDDHHMM);
-								String end = DateUtils.formatDate(in.getReleaseEnd(), AFTConstants.MMDDHHMM);
-								str2.append("限定项目所属人营销员").append(my.getName()).append("于")
-										.append(start).append("至").append(end).append("公出你的企业[").append(u.getNickname()).append("]请悉知!");
-								sendEmailAndNoticeAndSoucket(u.getAid(), 3, str2.toString());
-							}else {
-								str2.append(my.getName()).append("(需审核),准备公出您的企业")
-										.append("[").append(u.getNickname()).append("]。");
-								addPublicExamine(in.getId(), admin);
-								if (in.getPublicType() == null || in.getPublicType() == 0) in.setPublicType(1);
-								//审核通知
-								pushNoticeAndSoucketAndEmail(my, in, date, admin, str, map);
-								status.set(0);
+							//业务公出限定项目直接公出,不是业务项目审核公出
+							if(in.getType()==0){
+									List<RestrictProject> list = restrictProjectMapper.selectListByParam(new InputRestrictProject(u.getId(), my.getId()));
+									if (!list.isEmpty()){
+										String start = DateUtils.formatDate(in.getReleaseStart(), AFTConstants.MMDDHHMM);
+										String end = DateUtils.formatDate(in.getReleaseEnd(), AFTConstants.MMDDHHMM);
+										str2.append("限定项目所属人营销员").append(my.getName()).append("于")
+												.append(start).append("至").append(end).append("公出你的企业[").append(u.getNickname()).append("]请悉知!");
+										sendEmailAndNoticeAndSoucket(u.getAid(), 3, str2.toString());
+									}else {
+										str2.append(my.getName()).append("(需审核),准备公出您的企业")
+												.append("[").append(u.getNickname()).append("]。");
+										addPublicExamine(in.getId(), admin);
+										if (in.getPublicType() == null || in.getPublicType() == 0) in.setPublicType(1);
+										//审核通知
+										pushNoticeAndSoucketAndEmail(my, in, date, admin, str, map);
+										status.set(0);
+									}
+									//行政公出通知
+							}else if (in.getType()==2){
+									str2.append(my.getName()).append(",准备[行政公出]您的企业")
+											.append("[").append(u.getNickname()).append("]。");
+									addPublicExamine(in.getId(), admin);
+									//审核通知
+									pushNoticeAndSoucketAndEmail(my, in, date, admin, str, map);
+
 							}
-                        }
+						}
+
+
+
                     }
                 }else {
 					users.forEach(u->{