新增缴纳费用记录添加操作页面

src/main/java/com/caimei/modules/user/web/NewCmShopController.java

@@ -222,7 +222,6 @@ public class NewCmShopController extends BaseController {
                 }
             discernReceipt.getList().get(i).setValidityDate(cmDiscernReceipt.getValidityDate());
             discernReceipt.getList().get(i).setExpirationDate(cmDiscernReceipt.getExpirationDate());
-            cmDiscernReceipt.setShopID(discernReceipt.getList().get(i).getShopID());
             cmDiscernReceipt.setReceiptID(discernReceipt.getList().get(i).getReceiptID());
             cmDiscernReceipt.setLinkMan(discernReceipt.getList().get(i).getLinkMan());
             System.out.println(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"+num);
@@ -237,13 +236,13 @@ public class NewCmShopController extends BaseController {
     public String Removethelastfee(CmDiscernReceipt cmDiscernReceipt,Model model) {
 
 
-        OperationalLogs sysLog = new OperationalLogs();
+        CmOperationalLogs sysLog = new CmOperationalLogs();
         Date currentTime = new Date();
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
         //当前时间
         String dateString = formatter.format(currentTime);
         cmDiscernReceipt.setReceiptDate(dateString);
-        cmDiscernReceipt.setReceStatct(1);
+        cmDiscernReceipt.setReceStatct(2);
         newCmShopService.Removethelastfee(cmDiscernReceipt);
 
         //获取操作时间
@@ -260,16 +259,16 @@ public class NewCmShopController extends BaseController {
         sysLog.setOperationtype("编辑");
         if (!"".equals(sysLog.getActioncontent())) {
             if (sysLog.getInstitutionName() != null && sysLog.getContact() != null) {
-                int i = sysLogService.insert(sysLog);
+                int i = cmOperationalLogService.insert(sysLog);
             }
 
         }
-        return "redirect:" + Global.getAdminPath() + "/user/maintenanceList?shopName=" + cmDiscernReceipt.getShopName();
+        return "redirect:" + Global.getAdminPath() + "/user/maintenanceList";
     }
     @RequestMapping(value = "Removethelast")
     public String Removethelast(CmDiscernReceipt cmDiscernReceipt,Model model)
     {
-        OperationalLogs sysLog = new OperationalLogs();
+        CmOperationalLogs sysLog = new CmOperationalLogs();
         newCmShopService.Removethelast(cmDiscernReceipt);
         //获取操作时间
         sysLog.setOperationtime(new Date());
@@ -285,12 +284,12 @@ public class NewCmShopController extends BaseController {
         sysLog.setOperationtype("编辑");
         if (!"".equals(sysLog.getActioncontent())) {
             if (sysLog.getInstitutionName() != null && sysLog.getContact() != null) {
-                int i = sysLogService.insert(sysLog);
+                int i = cmOperationalLogService.insert(sysLog);
             }
 
         }
 
-        return "redirect:" + Global.getAdminPath() + "/user/maintenanceList?shopName="+cmDiscernReceipt.getShopName();
+        return "redirect:" + Global.getAdminPath() + "/user/maintenanceList";
     }
 
     /**

src/main/resources/mappings/modules/user/NewCmShopMapper.xml

@@ -449,7 +449,7 @@
 		<if test="endTime != null and endTime != ''">
 			AND (a.receiptDate &lt; #{endTime} OR  a.receiptDate = #{endTime})
 		</if>
-		 or a.receStatct is not null
+		 and a.receStatct is not null
 			ORDER BY a.receiptDate DESC
 		</where>
 		<choose>
@@ -460,12 +460,12 @@
 	</select>
 	<insert id="Removethelastfee">
 		insert into cm_discern_receipt
-			(shopID, receStatct, receiptDate,delFlag)
-		values (#{shopID},#{receStatct}, #{receiptDate},1)
+			(shopID, receStatct, receiptDate,delFlag,newReceiptType)
+		values (#{shopID},#{receStatct}, #{receiptDate},1,1)
 	</insert>
 
 	<update id="Removethelast">
-		update cm_discern_receipt set receStatct = 0 where id= #{receiptID}
+		update cm_discern_receipt set newReceiptType=1,receStatct = 1 where id= #{receiptID}
 	</update>
 
 </mapper>

src/main/webapp/WEB-INF/views/modules/user/maintenanceList.jsp

@@ -187,7 +187,7 @@
 							onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
 
 			&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
-			&nbsp;&nbsp;<input class="btn btn-primary" onclick="offocea(${CmDiscernReceipt.shopID},'${CmDiscernReceipt.linkMan}')" type="button" value="免除上架费"/>
+			&nbsp;&nbsp;<input class="btn btn-primary" onclick="offocea(${CmDiscernReceipt.shopID},'${CmDiscernReceipt.shopName}','${CmDiscernReceipt.linkMan}')" type="button" value="免除上架费"/>
 			</div>
 <%--		shopId, receStatct, receiptDate--%>
 		<strong>供应商:${CmDiscernReceipt.shopName}</strong>
@@ -210,16 +210,16 @@
 	<tbody>
 	<c:forEach items="${discernReceipt.list}" var="discernReceipt">
 		<td>${(page.pageNo-1)*page.pageSize+index.index+1}</td>
-		<c:if test="${discernReceipt.receStatct eq 1}">
+		<c:if test="${discernReceipt.receStatct eq 2}">
 			<td>免除上架费</td>
 			<td>${discernReceipt.receiptDate}</td>
 			<td>${discernReceipt.validityDate}</td>
 			<td>--</td>
 			<td>
-				<a href="javascript:void(0);" onclick="offoceb(${CmDiscernReceipt.receiptID},${CmDiscernReceipt.linkMan})">取消</a>
+				<a href="javascript:void(0);" onclick="offoceb(${discernReceipt.receiptID},'${CmDiscernReceipt.shopName}','${CmDiscernReceipt.linkMan}')">取消</a>
 			</td>
 		</c:if>
-		<c:if test="${discernReceipt.receStatct eq 0}">
+		<c:if test="${discernReceipt.receStatct eq 1}">
 			<td>免除上架费<span style="color: red">(已取消)</span></td>
 			<td>${discernReceipt.receiptDate}</td>
 			<td>${discernReceipt.validityDate}</td>
@@ -228,7 +228,7 @@
 				--
 			</td>
 		</c:if>
-		<c:if test="${empty discernReceipt.receStatct}">
+		<c:if test="${empty discernReceipt.receStatct || discernReceipt.receStatct eq 0}">
 			<td>${discernReceipt.receiptAmount}</td>
 			<td>${discernReceipt.receiptDate}</td>
 			<td>${discernReceipt.validityDate}</td>
@@ -244,19 +244,19 @@
 </table>
 <div class="pagination">${discernReceipt}</div>
 <script>
-	function offocea(shopId,linkMan) {
+	function offocea(shopID,shopName,linkMan) {
 		$.jBox.confirm("确定为该供应商免除上架费吗？","提示",function(v,h,f){
 
 			if(v === 1){
-				window.location.href="${ctx}/user/newCmShop/Removethelastfee?shopID="+shopId+"&linkMan="+linkMan;
+				window.location.href="${ctx}/user/newCmShop/Removethelastfee?shopID="+shopID+"&shopName="+shopName+"&linkMan="+linkMan;
 			}
 		} ,{ buttons: {  '确定': 1,'取消':2}});
 	}
-	function offoceb(id,linkMan) {
+	function offoceb(id,linkMan,shopName) {
 		$.jBox.confirm("确定取消免除该供应商上架费吗？？","提示",function(v,h,f){
 
 			if(v === 1){
-				window.location.href="${ctx}/user/newCmShop/Removethelast?receiptID="+id+"&linkMan="+linkMan;
+				window.location.href="${ctx}/user/newCmShop/Removethelast?receiptID="+id+"&linkMan="+linkMan+"&shopName="+shopName;
 			}
 		} ,{ buttons: {  '确定': 1,'取消':2}});
 	}