合计项目显示问题

common/src/main/resources/mapper/base/FundIncomeInfo.xml

@@ -199,7 +199,7 @@
 				]]>
 			</if>
 			<if test="searchParams.name != null">
-				and name_ = #{searchParams.name}
+				and name_ like #{searchParams.name}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

web/src/main/java/com/jpsoft/employment/modules/base/controller/FundIncomeInfoController.java

@@ -250,13 +250,13 @@ public class FundIncomeInfoController {
     @ApiOperation(value = "生成数据")
     @PostMapping("generateData")
     public MessageResult<FundIncomeInfo> generateData(
-            String templateId,String year,
+            String templateId, String year,
             @RequestAttribute String subject) {
         MessageResult<FundIncomeInfo> msgResult = new MessageResult<>();
 
         try {
 
-            int affectCount = fundIncomeInfoService.generateData(templateId, year,subject);
+            int affectCount = fundIncomeInfoService.generateData(templateId, year, subject);
 
             if (affectCount > 0) {
                 msgResult.setResult(true);
@@ -311,7 +311,7 @@ public class FundIncomeInfoController {
             }
 
             if (StringUtils.isNotEmpty(name)) {
-                searchParams.put("name", name);
+                searchParams.put("name", "%" + name + "%");
             }
 
 
@@ -330,7 +330,7 @@ public class FundIncomeInfoController {
                 map.put("serialNumber", fundIncomeInfo.getSerialNumber());
                 map.put("isSum", fundIncomeInfo.getIsSum());
                 BigDecimal budgetRevenue = fundIncomeInfo.getBudgetRevenue();
-                if(fundIncomeInfo.getIsSum()!=null) {
+                if (fundIncomeInfo.getIsSum() != null) {
                     if (fundIncomeInfo.getIsSum()) {
                         String serialNumber = fundIncomeInfo.getSerialNumber();
                         BigDecimal sumBudget = fundIncomeInfoService.sumBudgetRevenue(serialNumber + ".%", startDate, endDate);
@@ -411,17 +411,17 @@ public class FundIncomeInfoController {
 
                 map.put("attachment", fundIncomeInfo.getAttachment());
 
-                String incomeDepartment="";
-                if(StringUtils.isNotEmpty(fundIncomeInfo.getIncomeDepartment())){
+                String incomeDepartment = "";
+                if (StringUtils.isNotEmpty(fundIncomeInfo.getIncomeDepartment())) {
                     String[] incomeDepartmentArr = fundIncomeInfo.getIncomeDepartment().split(",");
-                    for (String departId:incomeDepartmentArr) {
+                    for (String departId : incomeDepartmentArr) {
                         DepartmentInfo departmentInfo = departmentInfoService.get(departId);
-                        if(departmentInfo!=null){
-                            incomeDepartment+=departmentInfo.getName()+",";
+                        if (departmentInfo != null) {
+                            incomeDepartment += departmentInfo.getName() + ",";
                         }
                     }
-                    if(StringUtils.isNotEmpty(incomeDepartment)){
-                        incomeDepartment = incomeDepartment.substring(0,incomeDepartment.lastIndexOf(","));
+                    if (StringUtils.isNotEmpty(incomeDepartment)) {
+                        incomeDepartment = incomeDepartment.substring(0, incomeDepartment.lastIndexOf(","));
                     }
                 }