Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/feedback/service/QuestionFeedbackService.java

@@ -31,12 +31,12 @@ public class QuestionFeedbackService extends CrudService<QuestionFeedbackDao, Qu
 	private QuestionFeedbackDao questionFeedbackDao;
 	@Override
 	public Page<QuestionFeedback> findPage(Page<QuestionFeedback> page, QuestionFeedback questionFeedback) {
-		//设置数据权限
-		if(!UserUtils.getUser().isAdmin()) {
-			String dataScopeSql = dataScopeFilter(questionFeedback.getCurrentUser(), "o", "u", "s", MenuStatusEnum.OVERALL_WORK_RECORDS.getValue());
-//			String dataScopeSql = dataScopeFilterOR(questionFeedback.getCurrentUser(), "o", "u", "s", MenuStatusEnum.WORK_PERFORMANCE.getValue());
-			questionFeedback.getSqlMap().put("dsf", dataScopeSql);
-		}
+//		//设置数据权限
+//		if(!UserUtils.getUser().isAdmin()) {
+//			String dataScopeSql = dataScopeFilter(questionFeedback.getCurrentUser(), "o", "u", "s", MenuStatusEnum.OVERALL_WORK_RECORDS.getValue());
+////			String dataScopeSql = dataScopeFilterOR(questionFeedback.getCurrentUser(), "o", "u", "s", MenuStatusEnum.WORK_PERFORMANCE.getValue());
+//			questionFeedback.getSqlMap().put("dsf", dataScopeSql);
+//		}
 		int count = dao.queryCount(questionFeedback);
 		page.setCount(count);
 		page.setCountFlag(false);

src/main/java/com/jeeplus/modules/workreimbursement/entity/WorkReimbursement.java

@@ -66,6 +66,7 @@ public class WorkReimbursement extends ActEntity<WorkReimbursement> {
 	private String taskName;
 	private Integer notifyFlag; //代办判定条件
 	private String notifyId; //代办判定条件
+	private String accountType;
 	public String getCreateOffice() {
 		return createOffice;
 	}

src/main/java/com/jeeplus/modules/workreimbursement/service/WorkReimbursementService.java

@@ -49,10 +49,7 @@ import com.jeeplus.modules.projectrecord.dao.WorkProjectUserDao;
 import com.jeeplus.modules.workreimbursement.dao.ReimbursementVATTaxDao;
 import com.jeeplus.modules.workreimbursement.dao.WorkAccountDao;
 import com.jeeplus.modules.workreimbursement.dao.WorkReimbursementDao;
-import com.jeeplus.modules.workreimbursement.entity.ReimbursementVATTax;
-import com.jeeplus.modules.workreimbursement.entity.WorkAccount;
-import com.jeeplus.modules.workreimbursement.entity.WorkAccountAudit;
-import com.jeeplus.modules.workreimbursement.entity.WorkReimbursement;
+import com.jeeplus.modules.workreimbursement.entity.*;
 import com.jeeplus.modules.workreimbursement.utils.HistoicFlowUtil;
 import com.jeeplus.modules.workreimbursement.utils.VarStr;
 import com.jeeplus.modules.workreimbursementback.dao.WorkReimbursementBackDao;
@@ -138,6 +135,8 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
     private ProjectRecordsService projectRecordsService;
     @Autowired
     private ProjectReportDataService projectReportDataService;
+    @Autowired
+    private WorkReimbursementTypeService workReimbursementTypeService;
 
     private static byte[] SYN_BYTE = new byte[0];
 
@@ -265,16 +264,26 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
         for (WorkReimbursement info: list) {
             WorkAccount workAccount = info.getWorkAccount();
             if(null != workAccount){
-                if(0 == workAccount.getProjectRadio()){
+                if (null == workAccount.getType()){
                     ProjectRecords project = new ProjectRecords();
                     project.setProjectName(workAccount.getReimburseRemarks());
                     info.setProject(project);
+                }else if (null != workAccount.getType()){
+                    WorkReimbursementTypeInfo workReimbursementTypeInfo= workReimbursementTypeService.get(workAccount.getType());
+                    String pid=workReimbursementTypeInfo.getParentIds().split(",")[1];
+                    if("0" == pid){
+                        ProjectRecords project = new ProjectRecords();
+                        project.setProjectName(workAccount.getReimburseRemarks());
+                        info.setProject(project);
+                    }else{
+                        //查询项目报告信息
+                        if (StringUtils.isNotBlank(info.getWorkAccount().getProject().getId())){
+                            ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(info.getWorkAccount().getProject().getId());
+                            info.setProjectName(projectReportData.getNumber());
+                        }
+                    }
                 }
-                //查询项目报告信息
-                if (StringUtils.isNotBlank(info.getWorkAccount().getProject().getId())){
-                    ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(info.getWorkAccount().getProject().getId());
-                    info.setProjectName(projectReportData.getNumber());
-                }
+
                 info.setBusinessTypeName(workAccount.getTypeName());
             }
             /*if(StringUtils.isNotBlank(info.getProcessInstanceId())){
@@ -585,7 +594,7 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
                         workAccount.setFinancialSubjects(workAccount.getFinancialSubjectss());
                     }
                     workAccount.setWorkReimbursement(workReimbursement);
-                    if (StringUtils.isBlank(workAccount.getId()) && workAccount.getMoney() != null) {
+                    if (StringUtils.isBlank(workAccount.getId())) {
                         workAccount.preInsert();
                         workAccountDao.insert(workAccount);
                     } else {

src/main/resources/mappings/modules/feedback/QuestionFeedbackDao.xml

@@ -35,9 +35,9 @@
 			<if test="content!=null and content !=''">
 				and a.content like CONCAT('%',#{content},'%')
 			</if>
-			<if test="sqlMap.dsf !=null and sqlMap.dsf!=''">
-				 ${sqlMap.dsf}
-			</if>
+<!--			<if test="sqlMap.dsf !=null and sqlMap.dsf!=''">-->
+<!--				 ${sqlMap.dsf}-->
+<!--			</if>-->
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -60,9 +60,9 @@
 			<if test="content!=null and content !=''">
 				and a.content like CONCAT('%',#{content},'%')
 			</if>
-			<if test="sqlMap.dsf !=null and sqlMap.dsf!=''">
-				 ${sqlMap.dsf}
-			</if>
+<!--			<if test="sqlMap.dsf !=null and sqlMap.dsf!=''">-->
+<!--				 ${sqlMap.dsf}-->
+<!--			</if>-->
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">

src/main/resources/mappings/modules/workreimbursement/WorkReimbursementDao.xml

@@ -64,6 +64,7 @@
 		,wrt.standard_detail as "workAccount.typeName"
 		,(select office_id from sys_user where id = wa.reimbursement_name) AS "officeId"
 		,p.id AS "project.projectId"
+		,wa.type as "workAccount.type"
 		FROM work_reimbursement a
 		left join work_account wa on wa.work_reimbursement_id =a.id
 		left join work_reimbursement_type_info wrt on wrt.id =wa.type