案例库项目 功能 修改2

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectRecordsCaseBaseService.java

@@ -11,6 +11,7 @@ import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingBatch;
 import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingbatchRelation;
 import com.jeeplus.modules.ruralprojectrecords.dao.RuralProjectMessageDao;
 import com.jeeplus.modules.ruralprojectrecords.dao.RuralProjectRecordsCaseBaseDao;
+import com.jeeplus.modules.ruralprojectrecords.dao.RuralProjectRecordsDao;
 import com.jeeplus.modules.ruralprojectrecords.dao.RuralWorkProjectUserDao;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
 import com.jeeplus.modules.sys.entity.MainDictDetail;
@@ -58,6 +59,8 @@ public class RuralProjectRecordsCaseBaseService extends CrudService<RuralProject
     private ProjectFilingbatchRelationDao filingbatchRelationDao;
     @Autowired
     private ProjectFilingBatchDao projectFilingBatchDao;
+    @Autowired
+    private RuralProjectRecordsDao ruralProjectRecordsDao;
 
     public Page<RuralProjectRecords> findPage(Page<RuralProjectRecords> page, RuralProjectRecords projectRecords) {
         //设置数据权限
@@ -340,5 +343,13 @@ public class RuralProjectRecordsCaseBaseService extends CrudService<RuralProject
     public void deleteCaseBase(RuralProjectRecords records){
         dao.deleteCaseBase(records);
     }
+    @Transactional(readOnly = false)
+    public void updateCaseBase(RuralProjectRecords records){
+        ruralProjectRecordsDao.updateCaseBase(records);
+    }
+    @Transactional(readOnly = false)
+    public void insertCaseBase(RuralProjectRecords records){
+        ruralProjectRecordsDao.insertCaseBase(records);
+    }
 
 }

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectRecordsService.java

@@ -4121,9 +4121,6 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 			dao.insertCaseBase(records);
 		}
 
-		//放入数据库，为案例项目的，不为不会有影响
-
-
 
 		return "保存审核意见成功";
 	}
@@ -4134,11 +4131,6 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		return list;
 	}
 
-//	//跟新案例项目相关信息
-//	public void updateCaseBase(RuralProjectRecords records){
-//		dao.updateCaseBase(records);
-//	}
-
 	/**
 	 * 强制撤销
 	 * @param

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectRecordsCaseBaseController.java

@@ -39,10 +39,7 @@ public class RuralProjectRecordsCaseBaseController extends BaseController {
     @Autowired
     private RuralProjectRecordsService projectRecordsService;
     @Autowired
-    private RuralProjectMessageService ruralProjectMessageService;
-    @Autowired
-    private RuralProjectRecordsDao ruralProjectRecordsDao;
-
+    private RuralProjectRecordsCaseBaseService caseBaseService;
 
     @ModelAttribute
     public RuralProjectRecords get(@RequestParam(required=false) String id) {
@@ -144,7 +141,6 @@ public class RuralProjectRecordsCaseBaseController extends BaseController {
 
     //选定按钮
     @RequiresPermissions("ruralProject:RuralProjectRecordsCaseBase:selectCaseBase")
-    @Transactional(readOnly = false)
     @RequestMapping("selectCaseBase")
     @ResponseBody
     public Map selectCaseBase(RuralProjectRecords records){
@@ -156,9 +152,9 @@ public class RuralProjectRecordsCaseBaseController extends BaseController {
         records.setCaseStatus("5");
         records.setCaseCreateBy(UserUtils.getUser().getId());
         if(list.size()!=0){
-            ruralProjectRecordsDao.updateCaseBase(records);
+            caseBaseService.updateCaseBase(records);
         }else {
-            ruralProjectRecordsDao.insertCaseBase(records);
+            caseBaseService.insertCaseBase(records);
         }
         map.put("result",1);
         map.put("msg","选定为案例项目成功");
@@ -167,7 +163,6 @@ public class RuralProjectRecordsCaseBaseController extends BaseController {
 
     //取消案例项目按钮
     @RequiresPermissions("ruralProject:RuralProjectRecordsCaseBase:canceCaseBase")
-    @Transactional(readOnly = false)
     @RequestMapping("canceCaseBase")
     @ResponseBody
     public Map canceCaseBase(RuralProjectRecords records){
@@ -178,9 +173,9 @@ public class RuralProjectRecordsCaseBaseController extends BaseController {
         records.setCaseType("0");
         records.setCaseCreateBy(UserUtils.getUser().getId());
         if(list.size()!=0){
-            ruralProjectRecordsDao.updateCaseBase(records);
+            caseBaseService.updateCaseBase(records);
         }else {
-            ruralProjectRecordsDao.insertCaseBase(records);
+            caseBaseService.insertCaseBase(records);
         }
         map.put("result",1);
         map.put("msg","选定案例项目取消成功");

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectRecordsCaseBaseDao.xml

@@ -508,7 +508,7 @@
 		</choose>
 	</select>
 	<update id="deleteCaseBase">
-		update case_base set case_status = '0'
+		update case_base set case_status = '7'
 		where project_id = #{id}
 	</update>
 

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectRecordsDao.xml

@@ -3471,7 +3471,76 @@
 	</update>
 
 	<select id="findCaseBaseList" resultType="RuralProjectRecords">
-		select * from rural_project_records rpr LEFT JOIN case_base cb on rpr.id = cb.project_id
+		SELECT
+		<include refid="projectRecordsColumns"/>
+		,a.submit_money as "submitMoney"
+		,a.project_type as projectType,
+		wci.name AS "workContractInfo.name",
+		wct.id AS "workContractInfo.client.id",
+		wct.name AS "workContractInfo.client.name",
+		o.top_company AS "office.name",
+		ifnull(prd.number ,"") as "projectReportNumber"
+		,ifnull(prd.status,0) as "projectReportStatus"
+		,ifnull(prd.name,"") as "projectReportName"
+		,ifnull(prr.status,0) as "projectReportRecordStatus"
+		,ifnull(prrd.status,0) as "downProjectReportRecordStatus",
+		prrd.file_num as recodeNum,
+		prr.process_instance_id as prrProcessInstanceId,
+		prrd.process_instance_id as prrdProcessInstanceId
+		,prd.id as prdId
+		,prr.id as prrId
+		,prrd.id as prrdId
+		,prd.audit_pass_date as auditPassDate
+		,if(date_add(prd.audit_pass_date,interval #{endingCount} day) >now(),"0","1") as reportedType
+		,ifnull(rprr.report_status,0) as "reportStatus"
+		,ifnull(rprr.sync_status,0) as "syncStatus"
+		,rprr.process_instance_id as "reportedProcessInstanceId"
+		,ifnull(prdt.status,0) as "projectReportStatusTwo"
+		,prdt.id as prdtId
+		,prdt.process_instance_id as prdtProcessinstanceId
+		,ifnull(pmdr.status,0) as "defectRecordStatus"
+		,pmdr.process_instance_id as "pmdrProcessInstanceId"
+		,pmdr.id as pmdrId
+		,ifnull(ppf.status,0) as "paperFilingStatus"
+		,ppf.process_instance_id as "ppfProcessInstanceId"
+		,ppf.id as "ppfId"
+		,pfb.process_instance_id AS "filingProcessinstanceId"
+		,ifnull(pfp.status,0) as "filingProjectStatus"
+		,prd.audit_pass_date as "prdAuditDate"
+		,cb.case_process_id as "caseProcessId"
+		,cb.case_type as "caseType"
+		,cb.case_create_by as "caseCreateBy"
+		,if(case_status > 0 ,case_status,"0") as "caseStatus"
+		FROM rural_project_records a
+		LEFT JOIN sys_area area ON area.id = a.area_id
+		left join rural_project_records_reported rprr on rprr.id = a.id
+		left join case_base cb on a.id = cb.project_id
+		/*LEFT JOIN project_flingbatch_relation pfp on pfp.project_id=a.id*/
+		left join
+		(select id,status,project_id,filing_batch from
+		(
+		select id,create_date,status,project_id,filing_batch
+		from project_flingbatch_relation order by create_date desc
+		)z
+		group by z.project_id desc
+		) pfp ON pfp.project_id = a.id
+
+		LEFT JOIN project_filingbatch pfb on pfb.id=pfp.filing_batch
+		LEFT JOIN sys_user sua on a.create_by = sua.id
+		<if test="leaderNameStr !=null and leaderNameStr !=''">
+			LEFT JOIN work_project_user w on a.id = w.project_id
+			LEFT JOIN sys_user su on w.user_id = su.id
+		</if>
+		LEFT JOIN work_project_user w1 on a.id = w1.project_id
+		LEFT JOIN work_contract_info wci on a.contract_id = wci.id
+		LEFT JOIN work_client_info wct on wci.client_id = wct.id
+		LEFT JOIN sys_office o ON o.id = a.office_id
+		left join project_report_data prd on prd.project_id = a.id
+		left join project_report_data_two prdt on prdt.project_id = a.id
+		left join rural_project_report_record prr on prr.report_id = prd.id
+		LEFT JOIN project_material_defect_record pmdr on prd.id = pmdr.report_id
+		left join rural_project_report_record_down prrd on prrd.report_id = prd.id
+		left join project_paper_filing ppf on ppf.project_id = a.id
 		<where>
 			<if test="#{id} != null and #{id} != ''">
 				cb.project_id = #{id}

src/main/webapp/static/common/jeeplus.js

@@ -562,6 +562,25 @@ function getAuditState(id)
     }
     return result;
 }
+function getCaseBaseAuditState(id)
+{
+    var result ={};
+    result.action = true;
+    switch(id)
+    {
+        case "0":result.label = "tempstores";result.status="未上报";break;
+        case "1":result.label = "tempstore";result.status="暂存";result.action = false;break;
+        case "2":result.label = "auditing";result.status="审批中";break;
+        case "3":result.label = "cancel";result.status="撤回";break;
+        case "4":result.label = "reject";result.status="驳回";break;
+        case "5":result.label = "signed";result.status="已完成";break;
+        case "6":result.label = "discarding";result.status="作废中";break;
+        case "7":result.label = "discarded";result.status="已作废";break;
+        default:
+            result.label = "unknown";result.status="未知";break;
+    }
+    return result;
+}
 function getAuditRecordState(id)
 {
     var result ={};

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectMessageList.jsp

@@ -116,8 +116,8 @@
 
 			}
 
-			layer.confirm('确定要删除该申请信息吗？', {
-				title: "确定要删除该申请信息吗",
+			layer.confirm('确定要撤回该申请信息吗？', {
+				title: "提示",
 				btn: ['确定','关闭'] //可以无限个按钮
 			},function(index, layero){
 				$.ajax({
@@ -152,7 +152,7 @@
 			}
 
 			layer.confirm('确定要申请案例项目吗？', {
-				title: "确定要申请案例项目吗",
+				title: "提示",
 				btn: ['确定','关闭'] //可以无限个按钮
 			},function(index, layero){
 				$.ajax({
@@ -867,7 +867,7 @@
 		body{
 			background-color:transparent;
 			filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#26FFFFFF, endColorstr=#26FFFFFF);
-			color:#ffffff;
+			/*color:#ffffff;*/
 			background-color:rgba(255,255,255,0);
 			height:100%;
 		}
@@ -1226,7 +1226,7 @@
 						return xml;
 					}}
 				,{align:'center', title: '案例项目申报',  width:150,templet:function(d){
-						var st = getReportedState(d.caseStatus);
+						var st = getCaseBaseAuditState(d.caseStatus);
 						if(st.action)
 							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.caseProcessId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status+ "</span>";
 						else

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralProjectRecordsCaseBaseList.jsp

@@ -1222,7 +1222,7 @@
 						return xml;
 					}}
 				,{align:'center', title: '案例项目申报',  width:150,templet:function(d){
-						var st = getReportedState(d.caseStatus);
+						var st = getCaseBaseAuditState(d.caseStatus);
 						if(st.action)
 							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.caseProcessId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status+ "</span>";
 						else

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/ruralProjectMessageAllList.jsp

@@ -981,7 +981,7 @@
 						return xml;
 					}}
 				,{align:'center', title: '案例项目申报',  width:150,templet:function(d){
-						var st = getReportedState(d.caseStatus);
+						var st = getCaseBaseAuditState(d.caseStatus);
 						if(st.action)
 							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.caseProcessId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status+ "</span>";
 						else

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageList.jsp

@@ -450,8 +450,8 @@
 
 			}
 
-			layer.confirm('确定要删除该申请信息吗？', {
-				title: "确定要删除该申请信息吗",
+			layer.confirm('确定要撤回该申请信息吗？', {
+				title: "提示",
 				btn: ['确定','关闭'] //可以无限个按钮
 			},function(index, layero){
 				$.ajax({
@@ -486,7 +486,7 @@
 			}
 
 			layer.confirm('确定要申请案例项目吗？', {
-				title: "确定要申请案例项目吗",
+				title: "提示",
 				btn: ['确定','关闭'] //可以无限个按钮
 			},function(index, layero){
 				$.ajax({
@@ -548,7 +548,7 @@
 		body{
 			background-color:transparent;
 			filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#26FFFFFF, endColorstr=#26FFFFFF);
-			color:#ffffff;
+			/*color:#ffffff;*/
 			background-color:rgba(255,255,255,0);
 			height:100%;
 		}
@@ -861,7 +861,7 @@
                         return xml;
                     }}
 				,{align:'center', title: '案例项目申报',  width:150,templet:function(d){
-						var st = getReportedState(d.caseStatus);
+						var st = getCaseBaseAuditState(d.caseStatus);
 						if(st.action)
 							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.caseProcessId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status+ "</span>";
 						else